nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: GLE for subcontracted PR is fg item rate is zero

Browse Source
This commit is contained in:
Nabin Hait
2020-08-22 19:17:18 +05:30
parent 6c6175200c
commit 98fda4b8c3
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -223,6 +223,15 @@ class PurchaseReceipt(BuyingController):
if not stock_value_diff: if not stock_value_diff:
continue continue
# If PR is sub-contracted and fg item rate is zero
# in that case if account for shource and target warehouse are same,
# then GL entries should not be posted
if flt(stock_value_diff) == flt(d.rm_supp_cost) \
and warehouse_account.get(self.supplier_warehouse) \
and warehouse_account[d.warehouse]["account"] == warehouse_account[self.supplier_warehouse]["account"]:
continue
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": warehouse_account[d.warehouse]["account"], "account": warehouse_account[d.warehouse]["account"],
"against": stock_rbnb, "against": stock_rbnb,
@@ -232,16 +241,17 @@ class PurchaseReceipt(BuyingController):
}, warehouse_account[d.warehouse]["account_currency"], item=d)) }, warehouse_account[d.warehouse]["account_currency"], item=d))
# stock received but not billed # stock received but not billed
stock_rbnb_currency = get_account_currency(stock_rbnb) if d.base_net_amount:
gl_entries.append(self.get_gl_dict({ stock_rbnb_currency = get_account_currency(stock_rbnb)
"account": stock_rbnb, gl_entries.append(self.get_gl_dict({
"against": warehouse_account[d.warehouse]["account"], "account": stock_rbnb,
"cost_center": d.cost_center, "against": warehouse_account[d.warehouse]["account"],
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "cost_center": d.cost_center,
"credit": flt(d.base_net_amount, d.precision("base_net_amount")), "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit_in_account_currency": flt(d.base_net_amount, d.precision("base_net_amount")) \ "credit": flt(d.base_net_amount, d.precision("base_net_amount")),
if stock_rbnb_currency==self.company_currency else flt(d.net_amount, d.precision("net_amount")) "credit_in_account_currency": flt(d.base_net_amount, d.precision("base_net_amount")) \
}, stock_rbnb_currency, item=d)) if stock_rbnb_currency==self.company_currency else flt(d.net_amount, d.precision("net_amount"))
}, stock_rbnb_currency, item=d))
negative_expense_to_be_booked += flt(d.item_tax_amount) negative_expense_to_be_booked += flt(d.item_tax_amount)