Merge branch 'develop' into payment-terms

This commit is contained in:
tunde
2017-10-19 17:47:31 +01:00
160 changed files with 3729 additions and 1012 deletions

View File

@@ -39,3 +39,4 @@ class TestShoppingCartSettings(unittest.TestCase):
frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 1")
test_dependencies = ["Tax Rule"]