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

fix: provisional entry for non-stock item

Browse Source
This commit is contained in:
Nabin Hait
2024-03-18 21:57:12 +05:30
parent 93fe136386
commit 0aef7f9671
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,7 +737,6 @@ class PurchaseInvoice(BuyingController):
"Company", self.company, "enable_provisional_accounting_for_non_stock_items" "Company", self.company, "enable_provisional_accounting_for_non_stock_items"
) )
) )
self.provisional_enpenses_booked_in_pr = False
if provisional_accounting_for_non_stock_items: if provisional_accounting_for_non_stock_items:
self.get_provisional_accounts() self.get_provisional_accounts()
@@ -982,37 +981,34 @@ class PurchaseInvoice(BuyingController):
fields=["name", "provisional_expense_account", "qty", "base_rate"], fields=["name", "provisional_expense_account", "qty", "base_rate"],
) )
default_provisional_account = self.get_company_default("default_provisional_account") default_provisional_account = self.get_company_default("default_provisional_account")
provisional_accounts = [
d.provisional_expense_account if d.provisional_expense_account else default_provisional_account
for d in pr_items
]
provisional_gl_entries = frappe.get_all(
"GL Entry",
filters={
"voucher_type": "Purchase Receipt",
"voucher_no": ("in", linked_purchase_receipts),
"account": ("in", provisional_accounts),
"is_cancelled": 0,
},
fields=["voucher_detail_no"],
)
rows_with_provisional_entries = [d.voucher_detail_no for d in provisional_gl_entries]
for item in pr_items: for item in pr_items:
self.provisional_accounts[item.name] = { self.provisional_accounts[item.name] = {
"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,
"has_provisional_entry": item.name in rows_with_provisional_entries,
} }
def make_provisional_gl_entry(self, gl_entries, item): def make_provisional_gl_entry(self, gl_entries, item):
if item.purchase_receipt: if item.purchase_receipt:
if not self.provisional_enpenses_booked_in_pr: pr_item = self.provisional_accounts.get(item.pr_detail, {})
pr_item = self.provisional_accounts.get(item.pr_detail, {}) if pr_item.get("has_provisional_entry"):
provisional_account = pr_item.get("provisional_account")
pr_qty = pr_item.get("qty")
pr_base_rate = pr_item.get("base_rate")
# Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt
provision_gle_against_pr = frappe.db.get_value(
"GL Entry",
{
"is_cancelled": 0,
"voucher_type": "Purchase Receipt",
"voucher_no": item.purchase_receipt,
"voucher_detail_no": item.pr_detail,
"account": provisional_account,
},
["name"],
)
if provision_gle_against_pr:
self.provisional_enpenses_booked_in_pr = True
if self.provisional_enpenses_booked_in_pr:
purchase_receipt_doc = frappe.get_cached_doc("Purchase Receipt", item.purchase_receipt) purchase_receipt_doc = frappe.get_cached_doc("Purchase Receipt", item.purchase_receipt)
# Intentionally passing purchase invoice item to handle partial billing # Intentionally passing purchase invoice item to handle partial billing
@@ -1020,9 +1016,9 @@ class PurchaseInvoice(BuyingController):
item, item,
gl_entries, gl_entries,
self.posting_date, self.posting_date,
provisional_account, pr_item.get("provisional_account"),
reverse=1, reverse=1,
item_amount=(min(item.qty, pr_qty) * pr_base_rate), item_amount=(min(item.qty, pr_item.get("qty")) * pr_item.get("base_rate")),
) )
def update_gross_purchase_amount_for_linked_assets(self, item): def update_gross_purchase_amount_for_linked_assets(self, item):