nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
Nabin Hait
2014-02-12 19:09:28 +05:30
parent a87121c6da
commit 36028bfb56
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@@ -20,4 +20,4 @@ erpnext.patches.4_0.map_charge_to_taxes_and_charges
execute:webnotes.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31 execute:webnotes.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
execute:webnotes.reload_doc('hr', 'doctype', 'employee') # 2014-02-03 execute:webnotes.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
execute:webnotes.conn.sql("update tabPage set module='Core' where name='Setup'") execute:webnotes.conn.sql("update tabPage set module='Core' where name='Setup'")
execute:patches.4_0.fields_to_be_renamed erpnext.patches.4_0.fields_to_be_renamed

2
erpnext/stock/get_item_details.py
View File

@@ -132,7 +132,7 @@ def get_basic_details(args, item_bean):
"expense_account": item.expense_account or args.expense_account \ "expense_account": item.expense_account or args.expense_account \
or webnotes.conn.get_value("Company", args.company, "default_expense_account"), or webnotes.conn.get_value("Company", args.company, "default_expense_account"),
"cost_center": item.selling_cost_center \ "cost_center": item.selling_cost_center \
if args.transaction_type == "selling" else args.buying_cost_center, if args.transaction_type == "selling" else item.buying_cost_center,
"batch_no": None, "batch_no": None,
"item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in "item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in
item_bean.doclist.get({"parentfield": "item_tax"})))), item_bean.doclist.get({"parentfield": "item_tax"})))),