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

Merge pull request #37699 from frappe/mergify/bp/version-14/pr-37687

Browse Source 
fix: add regional support to extend purchase gl entries (#37595)
This commit is contained in:
Deepesh Garg
2023-10-26 14:20:48 +05:30
committed by GitHub
parent 6b951bd17a 519bf3d377
commit f5120a6dd0
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,6 +314,7 @@ class PurchaseReceipt(BuyingController):
self.make_item_gl_entries(gl_entries, warehouse_account=warehouse_account) self.make_item_gl_entries(gl_entries, warehouse_account=warehouse_account)
self.make_tax_gl_entries(gl_entries) self.make_tax_gl_entries(gl_entries)
update_regional_gl_entries(gl_entries, self)
return process_gl_map(gl_entries) return process_gl_map(gl_entries)
@@ -752,14 +753,12 @@ class PurchaseReceipt(BuyingController):
po_details.append(d.purchase_order_item) po_details.append(d.purchase_order_item)
if po_details: if po_details:
updated_pr += update_billed_amount_based_on_po(po_details, update_modified) updated_pr += update_billed_amount_based_on_po(po_details, update_modified, self)
for pr in set(updated_pr): for pr in set(updated_pr):
pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr) pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr)
update_billing_percentage(pr_doc, update_modified=update_modified) update_billing_percentage(pr_doc, update_modified=update_modified)
self.load_from_db()
def get_stock_value_difference(voucher_no, voucher_detail_no, warehouse): def get_stock_value_difference(voucher_no, voucher_detail_no, warehouse):
return frappe.db.get_value( return frappe.db.get_value(
@@ -775,7 +774,7 @@ def get_stock_value_difference(voucher_no, voucher_detail_no, warehouse):
) )
def update_billed_amount_based_on_po(po_details, update_modified=True): def update_billed_amount_based_on_po(po_details, update_modified=True, pr_doc=None):
po_billed_amt_details = get_billed_amount_against_po(po_details) po_billed_amt_details = get_billed_amount_against_po(po_details)
# Get all Purchase Receipt Item rows against the Purchase Order Items # Get all Purchase Receipt Item rows against the Purchase Order Items
@@ -804,13 +803,19 @@ def update_billed_amount_based_on_po(po_details, update_modified=True):
po_billed_amt_details[pr_item.purchase_order_item] = billed_against_po po_billed_amt_details[pr_item.purchase_order_item] = billed_against_po
if pr_item.billed_amt != billed_amt_agianst_pr: if pr_item.billed_amt != billed_amt_agianst_pr:
frappe.db.set_value( # update existing doc if possible
"Purchase Receipt Item", if pr_doc and pr_item.parent == pr_doc.name:
pr_item.name, pr_item = next((item for item in pr_doc.items if item.name == pr_item.name), None)
"billed_amt", pr_item.db_set("billed_amt", billed_amt_agianst_pr, update_modified=update_modified)
billed_amt_agianst_pr,
update_modified=update_modified, else:
) frappe.db.set_value(
"Purchase Receipt Item",
pr_item.name,
"billed_amt",
billed_amt_agianst_pr,
update_modified=update_modified,
)
updated_pr.append(pr_item.parent) updated_pr.append(pr_item.parent)
@@ -886,9 +891,6 @@ def get_billed_amount_against_po(po_items):
def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate=False): def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate=False):
# Reload as billed amount was set in db directly
pr_doc.load_from_db()
# Update Billing % based on pending accepted qty # Update Billing % based on pending accepted qty
total_amount, total_billed_amount = 0, 0 total_amount, total_billed_amount = 0, 0
item_wise_returned_qty = get_item_wise_returned_qty(pr_doc) item_wise_returned_qty = get_item_wise_returned_qty(pr_doc)
@@ -914,7 +916,6 @@ def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate
percent_billed = round(100 * (total_billed_amount / (total_amount or 1)), 6) percent_billed = round(100 * (total_billed_amount / (total_amount or 1)), 6)
pr_doc.db_set("per_billed", percent_billed) pr_doc.db_set("per_billed", percent_billed)
pr_doc.load_from_db()
if update_modified: if update_modified:
pr_doc.set_status(update=True) pr_doc.set_status(update=True)
@@ -1193,3 +1194,8 @@ def get_item_account_wise_additional_cost(purchase_document):
def on_doctype_update(): def on_doctype_update():
frappe.db.add_index("Purchase Receipt", ["supplier", "is_return", "return_against"]) frappe.db.add_index("Purchase Receipt", ["supplier", "is_return", "return_against"])
@erpnext.allow_regional
def update_regional_gl_entries(gl_list, doc):
return