nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait
2015-07-02 16:33:52 +05:30
parent 50e363b24e 6385967ccd
commit 721dcb1870
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.1.0' __version__ = '5.1.1'

2
erpnext/change_log/v5_1_0.md → erpnext/change_log/v5/v5_1_0.md
View File

@@ -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) - 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 - Print format for recurring documents can be set by the users
- Recurring documents won't be created for Stopped Sales / Purchase Orders. - Recurring documents won't be created for Stopped Sales / Purchase Orders.

2
erpnext/hooks.py
View File

@@ -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_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.1.0" app_version = "5.1.1"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

5
erpnext/patches/v5_0/update_item_desc_in_invoice.py
View File

@@ -20,12 +20,11 @@ def execute():
for dt in dt_list: for dt in dt_list:
frappe.reload_doctype(dt) frappe.reload_doctype(dt)
records = frappe.db.sql("""select name, item_code, description from `tab{0}` 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 count = 1
for d in records: for d in records:
if d.item_code and item_details.get(d.item_code) \ if item_details.get(d.item_code) and cstr(d.description) == item_details.get(d.item_code).description:
and cstr(d.description) == item_details.get(d.item_code).description:
desc = item_details.get(d.item_code).description desc = item_details.get(d.item_code).description
image = item_details.get(d.item_code).image image = item_details.get(d.item_code).image
else: else:

2
setup.py
View File

@@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.1.0" version = "5.1.1"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()