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

fix: incorrect number of gl entries issue (#20352)

Browse Source
This commit is contained in:
rohitwaghchaure 2020-01-20 17:53:19 +05:30 committed by Nabin Hait
parent 7653a8b9fa
commit 6ae61a1693
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -783,6 +783,7 @@ def add_non_stock_items_cost(stock_entry, work_order, expense_account):
for name in non_stock_items: for name in non_stock_items:
non_stock_items_cost += flt(items.get(name[0])) * flt(stock_entry.fg_completed_qty) / flt(bom.quantity) non_stock_items_cost += flt(items.get(name[0])) * flt(stock_entry.fg_completed_qty) / flt(bom.quantity)
if non_stock_items_cost:
stock_entry.append('additional_costs', { stock_entry.append('additional_costs', {
'expense_account': expense_account, 'expense_account': expense_account,
'description': _("Non stock items"), 'description': _("Non stock items"),
@ -804,6 +805,7 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
additional_operating_cost_per_unit = \ additional_operating_cost_per_unit = \
flt(work_order.additional_operating_cost) / flt(work_order.qty) flt(work_order.additional_operating_cost) / flt(work_order.qty)
if additional_operating_cost_per_unit:
stock_entry.append('additional_costs', { stock_entry.append('additional_costs', {
"expense_account": expense_account, "expense_account": expense_account,
"description": "Additional Operating Cost", "description": "Additional Operating Cost",

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -682,6 +682,8 @@ class StockEntry(StockController):
if item_account_wise_additional_cost: if item_account_wise_additional_cost:
for d in self.get("items"): for d in self.get("items"):
for account, amount in iteritems(item_account_wise_additional_cost.get((d.item_code, d.name), {})): for account, amount in iteritems(item_account_wise_additional_cost.get((d.item_code, d.name), {})):
if not amount: continue
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": account, "account": account,
"against": d.expense_account, "against": d.expense_account,