Rohan Mitchell
|
e20d8d3e95
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-11 14:20:25 +11:00 |
|
Rohan Mitchell
|
fb3e292e20
|
Formatting
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
f499dd627a
|
with_tax_included_in_price handles exceptions gracefully
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
a32321df68
|
Clarify label
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
5a29311137
|
Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
81a6e07d5c
|
Admin can remove tax on an adjustment
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
727ecae62b
|
Admin can modify a taxed adjustment on an order
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
85e45fa558
|
Use select2
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
83c0093665
|
Admin can include tax when creating an adjustment
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
46a9304ae1
|
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
d794981ecf
|
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
|
2015-11-11 11:53:04 +11:00 |
|
Rob Harrington
|
d731d4e803
|
Making sure flash is a hash so that is can be used to initialize OpenStuct
|
2015-11-05 11:09:21 +11:00 |
|
Rohan Mitchell
|
65589d25c6
|
Display more verbose product and variant name
|
2015-11-05 09:50:00 +11:00 |
|
Rohan Mitchell
|
5ffad4d343
|
Fix quantity calculation
|
2015-11-05 09:43:44 +11:00 |
|
Rohan Mitchell
|
a3d638df67
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-04 11:15:01 +11:00 |
|
Rohan Mitchell
|
015f3eb9ac
|
Display summary rows for admin adjustments
|
2015-11-01 13:42:59 +11:00 |
|
Lynne Davis
|
7350dbb75e
|
Adding tweaks that have been missed from merges
|
2015-10-30 11:54:06 +11:00 |
|
Rohan Mitchell
|
f63a80300b
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-29 11:49:24 +11:00 |
|
Rohan Mitchell
|
87cf3eda41
|
Amend 'Detailed orders breakdown' heading with missing content
|
2015-10-29 11:48:12 +11:00 |
|
Maikel Linke
|
adf0a84669
|
Use ! version of find_by_permalink to recover on missing resource
|
2015-10-21 15:42:28 +11:00 |
|
Maikel Linke
|
f152e4054c
|
Remove obsolete deface
|
2015-10-21 10:04:29 +11:00 |
|
Maikel Linke
|
62d31f79ed
|
Remove obsolete deface
|
2015-10-21 10:04:28 +11:00 |
|
Rohan Mitchell
|
421774e46c
|
Do not send producer notifications when the producer has no orders for this order cycle
|
2015-10-17 11:02:47 +11:00 |
|
Rob Harrington
|
5b3e052f78
|
Using a compiled stylesheet for pdf styling
|
2015-10-16 21:36:18 +11:00 |
|
Rob Harrington
|
f12fd7b4a3
|
Adding button for print action to admin orders show page
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
40d627cb34
|
Adding new route for printing an order to pdf
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
6e7fc6a0f7
|
Adding invoice action to orders controller, to allow sending of invoice email
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
104b100fe6
|
Pulling distributor signoff out into separate partial
|
2015-10-16 17:25:39 +11:00 |
|
Rohan Mitchell
|
ecc3bad8c8
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-16 12:38:54 +11:00 |
|
Rohan Mitchell
|
4fbeb0c3b1
|
Check if an order is an account invoice
|
2015-10-15 10:05:27 +11:00 |
|
Rohan Mitchell
|
de80e6d5bf
|
Find adjustments for billable periods
|
2015-10-15 09:58:22 +11:00 |
|
Rohan Mitchell
|
92f7b72056
|
Check whether an individual adjustment has tax included
|
2015-10-15 09:58:06 +11:00 |
|
Rob Harrington
|
b22d591775
|
BillablePeriods don't get updated when account_invoice has been finalized
|
2015-10-14 14:36:38 +11:00 |
|
Rob Harrington
|
1ad0f95536
|
Updating Billable Periods job ignores versions of enterprises created in the future
|
2015-10-14 14:36:38 +11:00 |
|
Rob Harrington
|
a71410042f
|
Ensuring that account invoice orders have an address
|
2015-10-14 14:36:37 +11:00 |
|
Rob Harrington
|
815df3d667
|
Only clean up account invoice orders that aren't already complete, don't attempt to destroy persisted account_invoice orders
|
2015-10-14 14:36:37 +11:00 |
|
Rohan Mitchell
|
b5bc4701fa
|
Detailed xero report
|
2015-09-22 09:15:55 +10:00 |
|
Rohan Mitchell
|
7552776349
|
Add product_and_variant_name display for Variant
|
2015-09-21 16:49:31 +10:00 |
|
Rohan Mitchell
|
8f40702369
|
Line items report whether they have tax included
|
2015-09-21 15:57:04 +10:00 |
|
Rob Harrington
|
14fbeda29e
|
Adding bugsnag notification for case where account_invoice order has errors
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
1c6f3f4877
|
Translating words on admin accounts page
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
2dcbe2b4f2
|
Updating the admin account view to show use the new account_invoice model to display data
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
27384439f8
|
Fixing edge case in update_billable_periods job
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
13adb61b3a
|
Refactoring invoice update process to use new AccountInvoice model
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
77c10dafd6
|
Linking billable_periods to the relevant account_invoice upon creation
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
0debdcdd9c
|
Renaming files from user_invoice to account_invoice
|
2015-09-17 22:38:28 +10:00 |
|
Rob Harrington
|
ae30007fed
|
Redesignating all references to user_invoices as account_invoices
|
2015-09-17 22:38:28 +10:00 |
|
Rob Harrington
|
aa183dc9e0
|
Account Invoice jobs run by specifying a year and month rather than a specific start and end times
|
2015-09-17 22:38:28 +10:00 |
|
Rob Harrington
|
b1285cd07f
|
WIP: Adding AccountInvoice model to more robustly record information about enterprise user invoices
|
2015-09-17 22:38:28 +10:00 |
|
Rob Harrington
|
79497d28d2
|
Associating billable periods with the relevant adjustment, and moving labelling logic to model
|
2015-09-17 22:38:13 +10:00 |
|