From 7b6ed4f16e7c572495c1c15388cfd6f5308ee57a Mon Sep 17 00:00:00 2001 From: Himanshu Mishra Date: Tue, 28 May 2019 23:51:22 +0530 Subject: [PATCH 1/5] Update status_updater.py --- erpnext/controllers/status_updater.py | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 29bd014fc8d..204e7c3fc90 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -316,19 +316,27 @@ class StatusUpdater(Document): .format(frappe.db.escape(frappe.session.user)) def update_billing_status_for_zero_amount_refdoc(self, ref_dt): - ref_fieldname = ref_dt.lower().replace(" ", "_") - zero_amount_refdoc = [] - all_zero_amount_refdoc = frappe.db.sql_list("""select name from `tab%s` - where docstatus=1 and base_net_total = 0""" % ref_dt) + ref_fieldname = frappe.scrub(ref_dt) - for item in self.get("items"): - if item.get(ref_fieldname) \ - and item.get(ref_fieldname) in all_zero_amount_refdoc \ - and item.get(ref_fieldname) not in zero_amount_refdoc: - zero_amount_refdoc.append(item.get(ref_fieldname)) + ref_docs = [item.get(ref_fieldname) for item in (self.get('items') or []) if item.get(ref_fieldname)] + if not ref_docs: + return - if zero_amount_refdoc: - self.update_billing_status(zero_amount_refdoc, ref_dt, ref_fieldname) + zero_amount_refdocs = frappe.db.sql_list(f""" + SELECT + name + from + `tab{ref_dt}` + where + docstatus = 1 + and base_net_total = 0 + and name in %(ref_docs)s + """, { + 'ref_docs': ref_docs + }) + + if zero_amount_refdocs: + self.update_billing_status(zero_amount_refdocs, ref_dt, ref_fieldname) def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname): for ref_dn in zero_amount_refdoc: From d355741462f61fd85999643a8c88bbec109c0dce Mon Sep 17 00:00:00 2001 From: Himanshu Mishra Date: Tue, 28 May 2019 23:54:03 +0530 Subject: [PATCH 2/5] Python 2 compatibility -_- --- erpnext/controllers/status_updater.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 204e7c3fc90..2484586d041 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -322,7 +322,7 @@ class StatusUpdater(Document): if not ref_docs: return - zero_amount_refdocs = frappe.db.sql_list(f""" + zero_amount_refdocs = frappe.db.sql_list(""" SELECT name from @@ -331,7 +331,7 @@ class StatusUpdater(Document): docstatus = 1 and base_net_total = 0 and name in %(ref_docs)s - """, { + """.format(ref_dt=ref_dt), { 'ref_docs': ref_docs }) From f296a2f58aafdcf5db3f2b3b26505531c0d0ec89 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 29 May 2019 15:14:07 +0530 Subject: [PATCH 3/5] perf: Remove MANIFEST.in Faster pip install -e erpnext https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it https://github.com/frappe/frappe/pull/7360 --- MANIFEST.in | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 3e467e53621..00000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,20 +0,0 @@ -include MANIFEST.in -include requirements.txt -include *.json -include *.md -include *.py -include *.txt -include .travis.yml -recursive-include erpnext *.txt -recursive-include erpnext *.css -recursive-include erpnext *.csv -recursive-include erpnext *.html -recursive-include erpnext *.ico -recursive-include erpnext *.js -recursive-include erpnext *.json -recursive-include erpnext *.md -recursive-include erpnext *.png -recursive-include erpnext *.py -recursive-include erpnext *.svg -recursive-include erpnext/public * -recursive-exclude * *.pyc From cfecf3c5b104d3de70710c49c42aae5718d35beb Mon Sep 17 00:00:00 2001 From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Date: Wed, 29 May 2019 17:16:48 +0530 Subject: [PATCH 4/5] fix: Added description if item variants does not have description in map (#17795) * fix: variant item description based on attribute * fix: requested changes * fix: refactor --- erpnext/controllers/item_variant.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py index 31ae83a0ce2..4230d17ff0e 100644 --- a/erpnext/controllers/item_variant.py +++ b/erpnext/controllers/item_variant.py @@ -288,14 +288,18 @@ def copy_attributes_to_variant(item, variant): variant.variant_of = item.name - if not variant.description: - variant.description = "" - if 'description' not in allow_fields: - if item.variant_based_on == 'Item Attribute' and not variant.description: - variant.description = "
" + item.name + "
" - for d in variant.attributes: - variant.description += "
" + d.attribute + ": " + cstr(d.attribute_value) + "
" + if not variant.description: + variant.description = "" + + if item.variant_based_on=='Item Attribute': + if variant.attributes: + attributes_description = item.description + " " + for d in variant.attributes: + attributes_description += "
" + d.attribute + ": " + cstr(d.attribute_value) + "
" + + if attributes_description not in variant.description: + variant.description += attributes_description def make_variant_item_code(template_item_code, template_item_name, variant): """Uses template's item code and abbreviations to make variant's item code""" From 08617f770011a88121c042d63f5c585917a5bd84 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Thu, 30 May 2019 12:29:35 +0550 Subject: [PATCH 5/5] bumped to version 11.1.35 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 90bf6b772ef..69019252479 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.34' +__version__ = '11.1.35' def get_default_company(user=None): '''Get default company for user'''