From 98b52a7245f0bfdbfe214af22e4eb9841056bc58 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Mon, 31 Jul 2017 15:09:52 +0530 Subject: [PATCH] resolved merge conflicts on develop (#10185) * resolved merge conflicts on develop * [minor] removed the validate_activity --- erpnext/patches.txt | 9 ++------- erpnext/projects/doctype/timesheet/timesheet.py | 1 - erpnext/selling/doctype/quotation/test_quotation.py | 5 ----- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 3899bf675f..64cf5d06fe 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -422,16 +422,11 @@ erpnext.patches.v8_1.add_indexes_in_transaction_doctypes erpnext.patches.v8_3.set_restrict_to_domain_for_module_def erpnext.patches.v8_1.update_expense_claim_status erpnext.patches.v8_3.update_company_total_sales -<<<<<<< HEAD erpnext.patches.v8_4.make_scorecard_records -erpnext.patches.v8_1.set_delivery_date_in_so_item +erpnext.patches.v8_1.set_delivery_date_in_so_item #2017-07-28 erpnext.patches.v8_5.fix_tax_breakup_for_non_invoice_docs erpnext.patches.v8_5.remove_quotations_route_in_sidebar erpnext.patches.v8_5.update_existing_data_in_project_type erpnext.patches.v8_5.set_default_mode_of_payment -======= -erpnext.patches.v8_1.set_delivery_date_in_so_item #2017-07-28 -erpnext.patches.v8_5.fix_tax_breakup_for_non_invoice_docs erpnext.patches.v8_5.update_customer_group_in_POS_profile -erpnext.patches.v8_6.update_timesheet_company_from_PO ->>>>>>> master +erpnext.patches.v8_6.update_timesheet_company_from_PO \ No newline at end of file diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 6e7042efd9..16abd2499c 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -174,7 +174,6 @@ class Timesheet(Document): for data in self.get('time_logs'): self.check_workstation_timings(data) self.validate_overlap(data) - validate_activity(data) def validate_overlap(self, data): if self.production_order: diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py index a985283b2d..c642c47cd4 100644 --- a/erpnext/selling/doctype/quotation/test_quotation.py +++ b/erpnext/selling/doctype/quotation/test_quotation.py @@ -28,12 +28,7 @@ class TestQuotation(unittest.TestCase): self.assertEquals(sales_order.get("items")[0].prevdoc_docname, quotation.name) self.assertEquals(sales_order.customer, "_Test Customer") -<<<<<<< HEAD - for d in sales_order.get("items"): - d.delivery_date = add_months(quotation.transaction_date, 1) -======= sales_order.delivery_date = "2014-01-01" ->>>>>>> master sales_order.naming_series = "_T-Quotation-" sales_order.transaction_date = nowdate() sales_order.insert()