nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-12 17:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] if difference account blank then fetch from company

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-10-23 14:46:07 +05:30
parent 1b01e0ffb5
commit 2cdeb3bb7a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stock/doctype/stock_entry/stock_entry.py
View File

@@ -621,8 +621,10 @@ class DocType(StockController):
se_child.uom = item_dict[d]["stock_uom"] se_child.uom = item_dict[d]["stock_uom"]
se_child.stock_uom = item_dict[d]["stock_uom"] se_child.stock_uom = item_dict[d]["stock_uom"]
se_child.qty = flt(item_dict[d]["qty"]) se_child.qty = flt(item_dict[d]["qty"])
se_child.expense_account = item_dict[d]["expense_account"] se_child.expense_account = item_dict[d]["expense_account"] or \
se_child.cost_center = item_dict[d]["cost_center"] webnotes.conn.get_value("Company", self.doc.company, "default_expense_account")
se_child.cost_center = item_dict[d]["cost_center"] or \
webnotes.conn.get_value("Company", self.doc.company, "cost_center")
# in stock uom # in stock uom
se_child.transfer_qty = flt(item_dict[d]["qty"]) se_child.transfer_qty = flt(item_dict[d]["qty"])

6
stock/doctype/stock_entry_detail/stock_entry_detail.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-03-29 18:22:12", "creation": "2013-03-29 18:22:12",
"docstatus": 0, "docstatus": 0,
"modified": "2013-10-23 13:46:52", "modified": "2013-10-23 14:35:46",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -69,7 +69,9 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "item_name", "fieldname": "item_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Item Name" "label": "Item Name",
"print_hide": 1,
"read_only": 1
}, },
{ {
"doctype": "DocField", "doctype": "DocField",