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

[patch-fix] convert_stock_reco

Browse Source
This commit is contained in:
Rushabh Mehta 2015-03-20 15:04:13 +05:30
parent a7e21eb484
commit 8f343165ad
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/crm/doctype/newsletter/newsletter.json
View File

@ -78,7 +78,7 @@
], ],
"icon": "icon-envelope", "icon": "icon-envelope",
"idx": 1, "idx": 1,
"modified": "2015-03-19 07:39:53.550198", "modified": "2015-03-20 05:27:31.613881",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Newsletter", "name": "Newsletter",

13
erpnext/patches/v5_0/convert_stock_reconciliation.py
View File

@ -9,12 +9,13 @@ def execute():
{"reconciliation_json": ["!=", ""]}): {"reconciliation_json": ["!=", ""]}):
sr = frappe.get_doc("Stock Reconciliation", sr.name) sr = frappe.get_doc("Stock Reconciliation", sr.name)
for item in json.loads(sr.reconciliation_json): for item in json.loads(sr.reconciliation_json):
sr.append("items", { if item.get("item_code"):
"item_code": item.item_code, sr.append("items", {
"warehouse": item.warehouse, "item_code": item.item_code,
"valuation_rate": item.valuation_rate, "warehouse": item.warehouse,
"qty": item.qty "valuation_rate": item.valuation_rate,
}) "qty": item.qty
})
for item in sr.items: for item in sr.items:
item.db_update() item.db_update()

1
erpnext/support/__init__.py
View File

@ -1,7 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
install_docs = [ install_docs = [
{'doctype':'Role', 'role_name':'Support Team', 'name':'Support Team'}, {'doctype':'Role', 'role_name':'Support Team', 'name':'Support Team'},
{'doctype':'Role', 'role_name':'Support Manager', 'name':'Support Manager'},
{'doctype':'Role', 'role_name':'Maintenance User', 'name':'Maintenance User'}, {'doctype':'Role', 'role_name':'Maintenance User', 'name':'Maintenance User'},
{'doctype':'Role', 'role_name':'Maintenance Manager', 'name':'Maintenance Manager'} {'doctype':'Role', 'role_name':'Maintenance Manager', 'name':'Maintenance Manager'}
] ]