Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pricing rule testcase fixes

Browse Source
This commit is contained in:
Nabin Hait 2014-05-28 17:03:28 +05:30
parent e7546e2305
commit 47a8670d37
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
View File

@ -20,6 +20,7 @@ class TestPricingRule(unittest.TestCase):
"price_or_discount": "Discount Percentage", "price_or_discount": "Discount Percentage",
"price": 0, "price": 0,
"discount_percentage": 10, "discount_percentage": 10,
"company": "_Test Company"
} }
frappe.get_doc(test_record.copy()).insert() frappe.get_doc(test_record.copy()).insert()
@ -36,7 +37,6 @@ class TestPricingRule(unittest.TestCase):
"transaction_type": "selling", "transaction_type": "selling",
"customer": "_Test Customer", "customer": "_Test Customer",
}) })
details = get_item_details(args) details = get_item_details(args)
self.assertEquals(details.get("discount_percentage"), 10) self.assertEquals(details.get("discount_percentage"), 10)

1
erpnext/stock/get_item_details.py
View File

@ -268,6 +268,7 @@ def apply_pricing_rule(args):
args.supplier_type = frappe.db.get_value("Supplier", args.supplier, "supplier_type") args.supplier_type = frappe.db.get_value("Supplier", args.supplier, "supplier_type")
pricing_rules = get_pricing_rules(args) pricing_rules = get_pricing_rules(args)
pricing_rule = filter_pricing_rules(args, pricing_rules) pricing_rule = filter_pricing_rules(args, pricing_rules)
if pricing_rule: if pricing_rule: