From 366451fc62ab5055c2e0ad30ced26839bb15ffd8 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sun, 8 Sep 2019 09:51:15 +0530 Subject: [PATCH 1/2] fix: Minor fix in GSTR-1 --- erpnext/regional/report/gstr_1/gstr_1.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py index c397133f33..43e232bf72 100644 --- a/erpnext/regional/report/gstr_1/gstr_1.py +++ b/erpnext/regional/report/gstr_1/gstr_1.py @@ -163,15 +163,14 @@ class Gstr1Report(object): if not b2c_limit: frappe.throw(_("Please set B2C Limit in GST Settings.")) - if self.filters.get("type_of_business") == "B2C Large" and customers: + if self.filters.get("type_of_business") == "B2C Large": conditions += """ and SUBSTR(place_of_supply, 1, 2) != SUBSTR(company_gstin, 1, 2) - and grand_total > {0} and is_return != 1 and gst_category ='Unregistered' """.\ - format(flt(b2c_limit), ", ".join([frappe.db.escape(c.name) for c in customers])) - elif self.filters.get("type_of_business") == "B2C Small" and customers: + and grand_total > {0} and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit)) + + elif self.filters.get("type_of_business") == "B2C Small": conditions += """ and ( SUBSTR(place_of_supply, 1, 2) = SUBSTR(company_gstin, 1, 2) - or grand_total <= {0}) and is_return != 1 and gst_category ='Unregistered' """.\ - format(flt(b2c_limit), ", ".join([frappe.db.escape(c.name) for c in customers])) + or grand_total <= {0}) and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit)) elif self.filters.get("type_of_business") == "CDNR": conditions += """ and is_return = 1 """ From 594918bd3a18b339ea52df33f64d10d82b9b398a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 8 Sep 2019 13:13:05 +0530 Subject: [PATCH 2/2] fix: Include Item variant patch in patches.txt (#18961) --- erpnext/patches.txt | 3 ++- .../v12_0/add_variant_of_in_item_attribute_table.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 2af12698c5..2f74d54dd2 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -632,4 +632,5 @@ execute:frappe.reload_doc('desk', 'doctype','dashboard_chart') erpnext.patches.v12_0.add_default_dashboards erpnext.patches.v12_0.remove_bank_remittance_custom_fields erpnext.patches.v12_0.generate_leave_ledger_entries -erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit \ No newline at end of file +erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit +erpnext.patches.v12_0.add_variant_of_in_item_attribute_table diff --git a/erpnext/patches/v12_0/add_variant_of_in_item_attribute_table.py b/erpnext/patches/v12_0/add_variant_of_in_item_attribute_table.py index bc6119067c..bb13078b13 100644 --- a/erpnext/patches/v12_0/add_variant_of_in_item_attribute_table.py +++ b/erpnext/patches/v12_0/add_variant_of_in_item_attribute_table.py @@ -1,8 +1,8 @@ import frappe def execute(): - frappe.db.sql(''' - UPDATE `tabItem Variant Attribute` t1 - INNER JOIN `tabItem` t2 ON t2.name = t1.parent - SET t1.variant_of = t2.variant_of - ''') + frappe.db.sql(''' + UPDATE `tabItem Variant Attribute` t1 + INNER JOIN `tabItem` t2 ON t2.name = t1.parent + SET t1.variant_of = t2.variant_of + ''')