Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security

Conflicts:
	lib/open_food_network/xero_invoices_report.rb
This commit is contained in:
Rob Harrington
2015-12-17 14:22:16 +11:00
4 changed files with 7 additions and 5 deletions

View File

@@ -6,8 +6,8 @@ module OpenFoodNetwork
@opts = opts.
reject { |k, v| v.blank? }.
reverse_merge({report_type: 'summary',
invoice_date: Date.current,
due_date: 2.weeks.from_now.to_date,
invoice_date: Time.zone.today,
due_date: Time.zone.today + 1.month,
account_code: 'food sales'})
end