nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template

Browse Source
This commit is contained in:
Rushabh Mehta
2015-05-06 18:45:47 +05:30
parent 0e1540b3b7
commit bcdea3ea51
38 changed files with 7449 additions and 7419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py
View File

@@ -52,14 +52,14 @@ class TestShoppingCartSettings(unittest.TestCase):
"sales_taxes_and_charges_master": tax_master
})
for tax_master in ("_Test Sales Taxes and Charges Master", "_Test India Tax Master"):
for tax_master in ("_Test Sales Taxes and Charges Template", "_Test India Tax Master"):
_add_tax_master(tax_master)
controller = cart_settings
controller.validate_overlapping_territories("sales_taxes_and_charges_masters",
"sales_taxes_and_charges_master")
_add_tax_master("_Test Sales Taxes and Charges Master - Rest of the World")
_add_tax_master("_Test Sales Taxes and Charges Template - Rest of the World")
controller = cart_settings
self.assertRaises(ShoppingCartSetupError, controller.validate_overlapping_territories,

2
erpnext/shopping_cart/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.json
View File

@@ -8,7 +8,7 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Tax Master",
"options": "Sales Taxes and Charges Master",
"options": "Sales Taxes and Charges Template",
"permlevel": 0,
"reqd": 1
}

4
erpnext/shopping_cart/test_shopping_cart.py
View File

@@ -136,7 +136,7 @@ class TestShoppingCart(unittest.TestCase):
{"doctype": "Shopping Cart Taxes and Charges Master", "parentfield": "sales_taxes_and_charges_masters",
"sales_taxes_and_charges_master": "_Test India Tax Master"},
{"doctype": "Shopping Cart Taxes and Charges Master", "parentfield": "sales_taxes_and_charges_masters",
"sales_taxes_and_charges_master": "_Test Sales Taxes and Charges Master - Rest of the World"},
"sales_taxes_and_charges_master": "_Test Sales Taxes and Charges Template - Rest of the World"},
])
settings.set("shipping_rules", {"doctype": "Shopping Cart Shipping Rule", "parentfield": "shipping_rules",
"shipping_rule": "_Test Shipping Rule - India"})
@@ -205,5 +205,5 @@ class TestShoppingCart(unittest.TestCase):
quotation.save(ignore_permissions=True)
test_dependencies = ["Sales Taxes and Charges Master", "Price List", "Item Price", "Shipping Rule", "Currency Exchange",
test_dependencies = ["Sales Taxes and Charges Template", "Price List", "Item Price", "Shipping Rule", "Currency Exchange",
"Customer Group", "Lead", "Customer", "Contact", "Address", "Item"]