Merge branch 'develop'
This commit is contained in:
commit
721dcb1870
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '5.1.0'
|
||||
__version__ = '5.1.1'
|
||||
|
@ -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.
|
@ -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"
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user