Rob Harrington
e67e22ee73
Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security
...
Conflicts:
lib/open_food_network/xero_invoices_report.rb
2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2
Restricting access to orders within Sales Tax Report
...
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e
Restricting access to orders within Xero Invoices Report
...
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
2f2ebf419c
Fixing customer info security for packing reports
2015-12-17 14:21:30 +11:00
Rob Harrington
2f13ab6adf
Fixing customer info security for orders and fulfillments report
2015-12-17 14:21:29 +11:00
Rob Harrington
b121984e76
Fixing customer info security for bulk coop report
2015-12-17 14:21:29 +11:00
Rob Harrington
cc4f9dd09b
Making lettuceshare report spec more robust
2015-12-16 18:14:19 +11:00
Rob Harrington
18ea0c1717
Pulling VariantOverride scoping down into products and inventory report base
2015-12-16 14:23:43 +11:00
Rob Harrington
5d28a7fdf8
Adding SKU to Products and Inventory reports (except lettuceshare)
2015-12-16 13:37:19 +11:00
Em-AK
fcc328f00a
Display default xero invoice dates
...
fixes #682
* pre-fill the invoice_date and due_date in the xero report generation form
* increase the default period between invoice_date and due_date to 1 month in
XeroInvoiceReport
2015-12-13 16:42:32 +01:00
Maikel Linke
758b1f8e64
using in_stock? to filter variants in lettuceshare report
2015-12-11 15:12:28 +11:00
Maikel Linke
bb58473b90
Consider variant overrides in LettuceShare report
2015-12-11 15:12:28 +11:00
Maikel Linke
1d46c2febd
LettuceShare report: display only if count_on_hand > 0
...
Use the inventory of a distributor if selected.
2015-12-11 15:12:27 +11:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Rohan Mitchell
9d5606a4fd
Fix enterprise index page 500
2015-12-11 10:06:07 +11:00
Rohan Mitchell
243ef4ee16
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
46a9304ae1
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
2015-11-11 11:53:04 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +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
Rohan Mitchell
f63a80300b
Merge branch 'master' into folklabs-producer-emails
2015-10-29 11:49:24 +11:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
eba13a0dd7
Line items inherit units from variants upon creation
2015-10-28 13:07:31 +11:00
Rob Harrington
795830d94d
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
2015-10-28 13:07:31 +11:00
Maikel Linke
8bd78eb139
spec_helper for lib/open_food_network/permissions_spec.rb
2015-10-21 10:04:29 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rohan Mitchell
a766f007fc
Display xero report for account invoices
2015-10-15 11:57:51 +11:00
Rohan Mitchell
b5bc4701fa
Detailed xero report
2015-09-22 09:15:55 +10:00
Maikel Linke
adc20e9e4e
Handling tax categories without tax rates
2015-08-21 15:16:00 +10:00
Rohan Mitchell
3e5028b6b9
Revise lettuceshare report - combine grower and cert cols, add column headings
2015-08-16 11:06:52 +08:00
Rohan Mitchell
eca25a2564
Make coordinator fees apply to all variants, not just those with exchange fees
2015-07-31 16:57:47 +10:00
Rohan Mitchell
a90666467a
Add helper support to Reports DSL
2015-07-23 11:45:19 +10:00
Rohan Mitchell
cc9d0defca
Use class attributes instead of class variables to avoid leakage between subclasses
2015-07-23 11:04:36 +10:00
Rohan Mitchell
142e1d6d9a
Report outputs rules as array for use by OrderGrouper
2015-07-23 10:46:20 +10:00
Rohan Mitchell
1d39fb4438
Report rules can define a summary row
2015-07-23 10:37:47 +10:00
Rohan Mitchell
07eb857a8d
Report can define nested rules
2015-07-23 10:24:10 +10:00
Rohan Mitchell
66f64fc413
Report can define basic rules
2015-07-23 10:08:38 +10:00
Rohan Mitchell
c7a1ca29f4
Report can define and retrieve columns
2015-07-23 09:52:59 +10:00
Rohan Mitchell
0a5e8fe629
Report class can define and retrieve header
2015-07-23 09:36:09 +10:00
Rohan Mitchell
de7f3a9e5c
When an on-demand variant has overridden stock levels, make it not on-demand
2015-07-16 10:05:07 +10:00
Lynne Davis
f21f57a42c
Additions for packing reports, sans refactoring
2015-07-15 14:44:49 +10:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rob Harrington
30af5d4278
Enterprise relatives include self where appropriate for serialized injection data
2015-06-15 19:45:29 +08:00
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Maikel Linke
7461009c3b
Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:58 +10:00
