resolved merge conflicts on develop (#10185)
* resolved merge conflicts on develop
* [minor] removed the validate_activity
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3899bf6..64cf5d0 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -422,16 +422,11 @@
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 6e7042e..16abd24 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -174,7 +174,6 @@
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 a985283..c642c47 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -28,12 +28,7 @@
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()