resolved merge conflicts

This commit is contained in:
mbauskar
2017-07-31 12:30:53 +05:30
29 changed files with 409 additions and 122 deletions

View File

@@ -27,8 +27,7 @@ def test_recurring_document(obj, test_records):
base_doc.set(date_field, today)
if base_doc.doctype == "Sales Order":
for d in base_doc.get("items"):
d.set("delivery_date", add_days(today, 15))
base_doc.set("delivery_date", add_days(today, 15))
# monthly
doc1 = frappe.copy_doc(base_doc)