diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt b/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt index 126d11cd5f..d0925a2599 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt @@ -2,7 +2,7 @@ { "creation": "2014-02-21 15:02:51", "docstatus": 0, - "modified": "2014-02-27 18:08:42", + "modified": "2014-02-28 14:49:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -24,6 +24,7 @@ }, { "create": 1, + "delete": 1, "doctype": "DocPerm", "name": "__common__", "parent": "Pricing Rule", diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py index 294d5828db..25efd5f397 100644 --- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py @@ -67,10 +67,8 @@ class TestPricingRule(unittest.TestCase): args.item_code = "_Test Item 2" details = get_item_details(args) self.assertEquals(details.get("discount_percentage"), 15) - - - + frappe.db.sql("delete * from `tabPricing Rule`") test_records = [ [{ diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 25a0c71860..b5e6740626 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -37,13 +37,15 @@ class TestItem(unittest.TestCase): "amount": 0.0, "base_amount": 0.0, "batch_no": None, - "item_tax_rate": {}, + "item_tax_rate": '{}', "uom": "_Test UOM", "conversion_factor": 1.0, } make_test_records("Item Price") + frappe.db.sql("delete from `tabPricing Rule`") + details = get_item_details({ "item_code": "_Test Item", "company": "_Test Company",