From e98120b716f0e2bcc1c1bb6f74bef82811e37b9a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 16:29:28 +0530 Subject: [PATCH 1/3] [fix] Change log path --- erpnext/change_log/{ => v5}/v5_1_0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename erpnext/change_log/{ => v5}/v5_1_0.md (81%) diff --git a/erpnext/change_log/v5_1_0.md b/erpnext/change_log/v5/v5_1_0.md similarity index 81% rename from erpnext/change_log/v5_1_0.md rename to erpnext/change_log/v5/v5_1_0.md index 9a350025f4..3ed2227f82 100644 --- a/erpnext/change_log/v5_1_0.md +++ b/erpnext/change_log/v5/v5_1_0.md @@ -1,4 +1,4 @@ -- Item variants is now manageable via dedicated tool **Manage Variants**. To learn about it, check https://manual.erpnext.com/contents/stock/item/item-variants +- Item variants is now manageable via dedicated tool **Manage Variants**. To learn about it, check [Manual Page for Item variants](https://manual.erpnext.com/contents/stock/item/item-variants) - Against account in General Ledger will show Party instead of Account (which is not useful) - Print format for recurring documents can be set by the users - Recurring documents won't be created for Stopped Sales / Purchase Orders. From 34058ded0e63f01279f646cb268e575b30f359a5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 16:31:55 +0530 Subject: [PATCH 2/3] [fix] Update item image in sales invoice --- erpnext/patches/v5_0/update_item_desc_in_invoice.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/v5_0/update_item_desc_in_invoice.py b/erpnext/patches/v5_0/update_item_desc_in_invoice.py index b7a071cbfe..4e2cd26e9d 100644 --- a/erpnext/patches/v5_0/update_item_desc_in_invoice.py +++ b/erpnext/patches/v5_0/update_item_desc_in_invoice.py @@ -20,12 +20,11 @@ def execute(): for dt in dt_list: frappe.reload_doctype(dt) records = frappe.db.sql("""select name, item_code, description from `tab{0}` - where description is not null """.format(dt), as_dict=1) + where ifnull(item_code, '') != '' and description is not null """.format(dt), as_dict=1) count = 1 for d in records: - if d.item_code and item_details.get(d.item_code) \ - and cstr(d.description) == item_details.get(d.item_code).description: + if item_details.get(d.item_code) and cstr(d.description) == item_details.get(d.item_code).description: desc = item_details.get(d.item_code).description image = item_details.get(d.item_code).image else: From 6385967ccd82737ba052501bbee7f534c1061271 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 17:03:52 +0600 Subject: [PATCH 3/3] bumped to version 5.1.1 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 5069b2fe32..a71e77b33c 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.1.0' +__version__ = '5.1.1' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 8ee63feaf3..616184570e 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.1.0" +app_version = "5.1.1" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 0694a82ce1..774c07b9d4 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.1.0" +version = "5.1.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()