Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-07 08:00:07 +00:00
commit 8bef1d8506
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.6'
staging_version = '11.0.3-beta.7'
error_report_email = "support@erpnext.com"

1
erpnext/patches/v11_0/make_location_from_warehouse.py
View File

@ -6,6 +6,7 @@ import frappe
from frappe.utils.nestedset import rebuild_tree
def execute():
if not frappe.db.get_value('Asset', {'docstatus': ('<', 2) }, 'name'): return
frappe.reload_doc('assets', 'doctype', 'location')
frappe.reload_doc('stock', 'doctype', 'warehouse')