From 9b2b42dfc14bb131ed8929f28a87de0f54353a39 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 1 Aug 2017 11:10:09 +0530 Subject: [PATCH 1/4] Minor fix in bom_stock_qty patch --- erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py b/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py index 9e95eb0c23c..1f937bb8af8 100644 --- a/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py +++ b/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py @@ -10,4 +10,5 @@ def execute(): frappe.reload_doc('manufacturing', 'doctype', 'bom_scrap_item') frappe.db.sql("update `tabBOM Item` set stock_qty = qty, uom = stock_uom, conversion_factor = 1") frappe.db.sql("update `tabBOM Explosion Item` set stock_qty = qty") - frappe.db.sql("update `tabBOM Scrap Item` set stock_qty = qty") \ No newline at end of file + if "qty" in frappe.db.get_table_columns("BOM Scrap Item"): + frappe.db.sql("update `tabBOM Scrap Item` set stock_qty = qty") \ No newline at end of file From ec9430dae7027ad299aa33ec690f707613777880 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 2 Aug 2017 18:16:13 +0530 Subject: [PATCH 2/4] [Fix] Default selling settings not fetched on customer quick entry form (#10243) --- erpnext/startup/boot.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py index ceeceaa3c93..6b503b3eec2 100644 --- a/erpnext/startup/boot.py +++ b/erpnext/startup/boot.py @@ -16,8 +16,10 @@ def boot_session(bootinfo): update_page_info(bootinfo) load_country_and_currency(bootinfo) - bootinfo.sysdefaults.territory = get_root_of('Territory') - bootinfo.sysdefaults.customer_group = get_root_of('Customer Group') + bootinfo.sysdefaults.territory = frappe.db.get_single_value('Selling Settings', + 'territory') or get_root_of('Territory') + bootinfo.sysdefaults.customer_group = frappe.db.get_single_value('Selling Settings', + 'customer_group') or get_root_of('Customer Group') bootinfo.notification_settings = frappe.get_doc("Notification Control", "Notification Control") From ce436b7698fc395df8ddc6fd45d012fd9beaeb6e Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 2 Aug 2017 18:16:53 +0530 Subject: [PATCH 3/4] [minor] set description to '' if template description is not available (#10244) --- erpnext/controllers/item_variant.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py index 226b17f7a2b..967c1339f1c 100644 --- a/erpnext/controllers/item_variant.py +++ b/erpnext/controllers/item_variant.py @@ -169,7 +169,6 @@ def create_variant(item, args): return variant - def copy_attributes_to_variant(item, variant): from frappe.model import no_value_fields @@ -189,6 +188,8 @@ def copy_attributes_to_variant(item, variant): variant.set(field.fieldname, item.get(field.fieldname)) variant.variant_of = item.name variant.has_variants = 0 + if not variant.description: + variant.description = '' if item.variant_based_on=='Item Attribute': if variant.attributes: From 4d49a7f6d12927912498440adb365e3db353c68b Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 2 Aug 2017 18:48:14 +0600 Subject: [PATCH 4/4] bumped to version 8.6.6 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 833ddff2239..618d1063904 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.6.5' +__version__ = '8.6.6' def get_default_company(user=None): '''Get default company for user'''