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

..

assets

Adding an example bill calculator to business model config edit page

2015-12-16 19:18:58 +11:00

controllers

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

2015-12-17 14:22:16 +11:00

helpers

Fixing up enterprise user account page

2015-12-16 19:18:59 +11:00

jobs

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

mailers

Use mail() instead of devise_mail

2015-12-04 10:37:55 +11:00

models

Auto-merge from CI [skip ci]

2015-12-17 13:02:37 +11:00

overrides

Adding BMC link to configurations menu

2015-12-16 19:18:57 +11:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Adding preferences to enterprises for sorting of order cycles in shopfront list

2015-12-16 11:55:23 +11:00

views

Restricting access to orders within Sales Tax Report

2015-12-17 14:21:30 +11:00