schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: GL Entries for SLE diff

Browse Source 
(cherry picked from commit df2a0e265b)
This commit is contained in:
Deepesh Garg
2022-10-11 14:55:09 +05:30
committed by Mergify
parent 49221d47c2
commit b386b8c634
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/controllers/stock_controller.py
View File

@@ -149,7 +149,7 @@ class StockController(AccountsController):
if warehouse_account.get(sle.warehouse): if warehouse_account.get(sle.warehouse):
# from warehouse account # from warehouse account
sle_rounding_diff += flt(sle.stock_value_difference, precision) sle_rounding_diff += flt(sle.stock_value_difference)
self.check_expense_account(item_row) self.check_expense_account(item_row)
@@ -193,19 +193,24 @@ class StockController(AccountsController):
elif sle.warehouse not in warehouse_with_no_account: elif sle.warehouse not in warehouse_with_no_account:
warehouse_with_no_account.append(sle.warehouse) warehouse_with_no_account.append(sle.warehouse)
if sle_rounding_diff > 0: if abs(sle_rounding_diff) > 0.1 and (
expense_account = item_row.get("expense_account") self.get("is_internal_customer") or self.get("is_internal_supplier")
target_warehouse_account = warehouse_account[item_row.get("target_warehouse")]["account"] ):
source_warehouse_account = warehouse_account[item_row.get("warehouse")]["account"] asset_account = ""
if self.get("is_internal_customer"):
asset_account = warehouse_account[item_row.get("target_warehouse")]["account"]
elif self.get("is_internal_supplier"):
asset_account = warehouse_account[item_row.get("from_warehouse")]["account"]
expense_account = item_row.get("expense_account")
gl_list.append( gl_list.append(
self.get_gl_dict( self.get_gl_dict(
{ {
"account": target_warehouse_account or expense_account, "account": expense_account,
"against": expense_account, "against": asset_account,
"cost_center": item_row.cost_center, "cost_center": item_row.cost_center,
"project": item_row.project or self.get("project"), "project": item_row.project or self.get("project"),
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "remarks": _("Rounding gain/loss Entry for Stock Transfer"),
"debit": sle_rounding_diff, "debit": sle_rounding_diff,
"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No", "is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
}, },
@@ -217,11 +222,11 @@ class StockController(AccountsController):
gl_list.append( gl_list.append(
self.get_gl_dict( self.get_gl_dict(
{ {
"account": source_warehouse_account or expense_account, "account": asset_account,
"against": target_warehouse_account, "against": expense_account,
"cost_center": item_row.cost_center, "cost_center": item_row.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "remarks": _("Rounding gain/loss Entry for Stock Transfer"),
"debit": -1 * sle_rounding_diff, "credit": sle_rounding_diff,
"project": item_row.get("project") or self.get("project"), "project": item_row.get("project") or self.get("project"),
"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No", "is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
}, },