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

pricing rule: fixes in testcase

Browse Source
This commit is contained in:
Nabin Hait 2014-02-28 15:04:05 +05:30
parent 3319170805
commit 13b93ebed8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/pricing_rule/pricing_rule.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2014-02-21 15:02:51", "creation": "2014-02-21 15:02:51",
"docstatus": 0, "docstatus": 0,
"modified": "2014-02-27 18:08:42", "modified": "2014-02-28 14:49:15",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -24,6 +24,7 @@
}, },
{ {
"create": 1, "create": 1,
"delete": 1,
"doctype": "DocPerm", "doctype": "DocPerm",
"name": "__common__", "name": "__common__",
"parent": "Pricing Rule", "parent": "Pricing Rule",

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

@ -68,9 +68,7 @@ class TestPricingRule(unittest.TestCase):
details = get_item_details(args) details = get_item_details(args)
self.assertEquals(details.get("discount_percentage"), 15) self.assertEquals(details.get("discount_percentage"), 15)
frappe.db.sql("delete * from `tabPricing Rule`")
test_records = [ test_records = [
[{ [{

4
erpnext/stock/doctype/item/test_item.py
View File

@ -37,13 +37,15 @@ class TestItem(unittest.TestCase):
"amount": 0.0, "amount": 0.0,
"base_amount": 0.0, "base_amount": 0.0,
"batch_no": None, "batch_no": None,
"item_tax_rate": {}, "item_tax_rate": '{}',
"uom": "_Test UOM", "uom": "_Test UOM",
"conversion_factor": 1.0, "conversion_factor": 1.0,
} }
make_test_records("Item Price") make_test_records("Item Price")
frappe.db.sql("delete from `tabPricing Rule`")
details = get_item_details({ details = get_item_details({
"item_code": "_Test Item", "item_code": "_Test Item",
"company": "_Test Company", "company": "_Test Company",