Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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 66ff5e5e77
commit df175cc8fc
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,6 +227,14 @@ 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,
@ -242,7 +250,7 @@ class PurchaseReceipt(BuyingController):
credit_amount = flt(d.base_net_amount, d.precision("base_net_amount")) \ credit_amount = flt(d.base_net_amount, d.precision("base_net_amount")) \
if credit_currency == self.company_currency else flt(d.net_amount, d.precision("net_amount")) if credit_currency == self.company_currency else flt(d.net_amount, d.precision("net_amount"))
if credit_amount:
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": warehouse_account[d.from_warehouse]['account'] \ "account": warehouse_account[d.from_warehouse]['account'] \
if d.from_warehouse else stock_rbnb, if d.from_warehouse else stock_rbnb,