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

fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice

Browse Source 
This applies for Provisional Accounting for Non-stock items

(cherry picked from commit 1c0a24424a)
This commit is contained in:
ruthra kumar
2024-05-17 17:06:39 +05:30
committed by Mergify
parent 80810c2ebb
commit 82d206b709
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -982,7 +982,7 @@ class PurchaseInvoice(BuyingController):
pr_items = frappe.get_all( pr_items = frappe.get_all(
"Purchase Receipt Item", "Purchase Receipt Item",
filters={"parent": ("in", linked_purchase_receipts)}, filters={"parent": ("in", linked_purchase_receipts)},
fields=["name", "provisional_expense_account", "qty", "base_rate"], fields=["name", "provisional_expense_account", "qty", "base_rate", "rate"],
) )
default_provisional_account = self.get_company_default("default_provisional_account") default_provisional_account = self.get_company_default("default_provisional_account")
provisional_accounts = set( provisional_accounts = set(
@@ -1010,6 +1010,7 @@ class PurchaseInvoice(BuyingController):
"provisional_account": item.provisional_expense_account or default_provisional_account, "provisional_account": item.provisional_expense_account or default_provisional_account,
"qty": item.qty, "qty": item.qty,
"base_rate": item.base_rate, "base_rate": item.base_rate,
"rate": item.rate,
"has_provisional_entry": item.name in rows_with_provisional_entries, "has_provisional_entry": item.name in rows_with_provisional_entries,
} }
@@ -1026,7 +1027,10 @@ class PurchaseInvoice(BuyingController):
self.posting_date, self.posting_date,
pr_item.get("provisional_account"), pr_item.get("provisional_account"),
reverse=1, reverse=1,
item_amount=(min(item.qty, pr_item.get("qty")) * pr_item.get("base_rate")), item_amount=(
(min(item.qty, pr_item.get("qty")) * pr_item.get("rate"))
* purchase_receipt_doc.get("conversion_rate")
),
) )
def update_gross_purchase_amount_for_linked_assets(self, item): def update_gross_purchase_amount_for_linked_assets(self, item):