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

fix: merge conflicts

Browse Source
This commit is contained in:
Saqib Ansari
2022-02-09 16:44:13 +05:30
parent 23a5b3df18
commit d97fa58e4f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,7 +630,6 @@ class TestPricingRule(unittest.TestCase):
for doc in [si, si1]: for doc in [si, si1]:
doc.delete() doc.delete()
<<<<<<< HEAD
def test_multiple_pricing_rules_with_min_qty(self): def test_multiple_pricing_rules_with_min_qty(self):
make_pricing_rule(discount_percentage=20, selling=1, priority=1, min_qty=4, make_pricing_rule(discount_percentage=20, selling=1, priority=1, min_qty=4,
apply_multiple_pricing_rules=1, title="_Test Pricing Rule with Min Qty - 1") apply_multiple_pricing_rules=1, title="_Test Pricing Rule with Min Qty - 1")
@@ -650,7 +649,7 @@ class TestPricingRule(unittest.TestCase):
frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 1") frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 1")
frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 2") frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 2")
=======
def test_remove_pricing_rule(self): def test_remove_pricing_rule(self):
item = make_item("Water Flask") item = make_item("Water Flask")
make_item_price("Water Flask", "_Test Price List", 100) make_item_price("Water Flask", "_Test Price List", 100)
@@ -691,7 +690,6 @@ class TestPricingRule(unittest.TestCase):
frappe.get_doc("Item Price", {"item_code": "Water Flask"}).delete() frappe.get_doc("Item Price", {"item_code": "Water Flask"}).delete()
item.delete() item.delete()
>>>>>>> b8c41e3030 (test: item price on remove pricing rule)
test_dependencies = ["Campaign"] test_dependencies = ["Campaign"]