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

fix: patch

Browse Source 
(cherry picked from commit 1230127d24)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
Mihir Kandoi
2025-02-19 13:03:45 +05:30
committed by Mergify
parent a09c57f0d1
commit 8f2fdcae88
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -402,6 +402,7 @@ execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_post
erpnext.patches.v14_0.disable_add_row_in_gross_profit erpnext.patches.v14_0.disable_add_row_in_gross_profit
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
erpnext.patches.v14_0.update_posting_datetime erpnext.patches.v14_0.update_posting_datetime
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
@@ -414,3 +415,7 @@ erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_differenc
erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference
erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field
>>>>>>> 154e9813c4 (fix: revert last commit) >>>>>>> 154e9813c4 (fix: revert last commit)
=======
erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference
erpnext.patches.v15_0.recalculate_amount_difference_field
>>>>>>> 1230127d24 (fix: patch)

9
erpnext/stock/doctype/purchase_receipt_item/patches/recalculate_amount_difference_field.py → erpnext/patches/v15_0/recalculate_amount_difference_field.py
View File

@@ -31,6 +31,8 @@ def execute():
if result := query.run(as_dict=True): if result := query.run(as_dict=True):
item_wise_billed_qty = get_billed_qty_against_purchase_receipt([item.name for item in result]) item_wise_billed_qty = get_billed_qty_against_purchase_receipt([item.name for item in result])
purchase_receipts = set()
precision = frappe.get_precision("Purchase Receipt Item", "amount")
for item in result: for item in result:
adjusted_amt = 0.0 adjusted_amt = 0.0
@@ -44,7 +46,7 @@ def execute():
) * item.qty ) * item.qty
adjusted_amt = flt( adjusted_amt = flt(
adjusted_amt * flt(item.conversion_rate), adjusted_amt * flt(item.conversion_rate),
frappe.get_precision("Purchase Receipt Item", "amount"), precision,
) )
if adjusted_amt != item.amount_difference_with_purchase_invoice: if adjusted_amt != item.amount_difference_with_purchase_invoice:
@@ -55,7 +57,10 @@ def execute():
adjusted_amt, adjusted_amt,
update_modified=False, update_modified=False,
) )
adjust_incoming_rate_for_pr(frappe.get_doc("Purchase Receipt", item.parent)) purchase_receipts.add(item.parent)
for pr in purchase_receipts:
adjust_incoming_rate_for_pr(frappe.get_doc("Purchase Receipt", pr))
def get_billed_qty_against_purchase_receipt(pr_names): def get_billed_qty_against_purchase_receipt(pr_names):

0
erpnext/stock/doctype/purchase_receipt_item/patches/rename_field_from_rate_difference_to_amount_difference.py → erpnext/patches/v15_0/rename_field_from_rate_difference_to_amount_difference.py
View File

0
erpnext/stock/doctype/purchase_receipt_item/patches/__init__.py
View File