From 4d347b1ca07df2df9770df2a4e4a4528fabc79bb Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 19 Mar 2018 11:32:39 +0530 Subject: [PATCH 1/3] travis fix --- erpnext/controllers/selling_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 606cc90866..2a22b32637 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -330,7 +330,7 @@ class SellingController(StockController): self.make_sl_entries(sl_entries) def set_po_nos(self): - if self.doctype in ("Delivery Note", "Sales Invoice"): + if self.doctype in ("Delivery Note", "Sales Invoice") and hasattr(self, "items"): ref_fieldname = "against_sales_order" if self.doctype == "Delivery Note" else "sales_order" sales_orders = list(set([d.get(ref_fieldname) for d in self.items if d.get(ref_fieldname)])) if sales_orders: From 5042dd32da74df5093b31527c89148256b114aec Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 19 Mar 2018 17:45:39 +0530 Subject: [PATCH 2/3] undefined args error --- .../course_wise_assessment_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py index 5badda6565..ce581486ec 100644 --- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py @@ -245,5 +245,5 @@ def get_child_assessment_groups(assessment_group): assessment_groups = [d.get("value") for d in get_children("Assessment Group", assessment_group) if d.get("value") and not d.get("expandable")] else: - assessment_groups = [args.assessment_group] + assessment_groups = [assessment_group] return assessment_groups From 9602bf4ba3566479fb10e590dad0e4f082122eb8 Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 19 Mar 2018 18:17:54 +0530 Subject: [PATCH 3/3] patch fix --- erpnext/patches/v10_0/update_hub_connector_domain.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/patches/v10_0/update_hub_connector_domain.py b/erpnext/patches/v10_0/update_hub_connector_domain.py index fc3c29403f..808ae77129 100644 --- a/erpnext/patches/v10_0/update_hub_connector_domain.py +++ b/erpnext/patches/v10_0/update_hub_connector_domain.py @@ -1,8 +1,9 @@ import frappe def execute(): - frappe.db.sql(""" - UPDATE `tabData Migration Connector` - SET hostname = 'https://hubmarket.org' - WHERE connector_name = 'Hub Connector' - """) \ No newline at end of file + if frappe.db.table_exists("Data Migration Connector"): + frappe.db.sql(""" + UPDATE `tabData Migration Connector` + SET hostname = 'https://hubmarket.org' + WHERE connector_name = 'Hub Connector' + """) \ No newline at end of file