mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-14 12:38:46 +00:00
fix: recalculate_amount_difference_field patch
(cherry picked from commit 0492b941ff)
# Conflicts:
# erpnext/patches/v15_0/recalculate_amount_difference_field.py
This commit is contained in:
@@ -1,12 +1,13 @@
|
|||||||
import frappe
|
import frappe
|
||||||
from frappe.query_builder.functions import Sum
|
from frappe.query_builder.functions import Sum
|
||||||
from frappe.utils import flt
|
from frappe.utils import flt, getdate
|
||||||
|
|
||||||
from erpnext.accounts.utils import get_fiscal_year
|
from erpnext.accounts.utils import get_fiscal_year
|
||||||
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import adjust_incoming_rate_for_pr
|
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import adjust_incoming_rate_for_pr
|
||||||
|
|
||||||
|
|
||||||
def execute():
|
def execute():
|
||||||
|
<<<<<<< HEAD
|
||||||
table = frappe.qb.DocType("Purchase Receipt Item")
|
table = frappe.qb.DocType("Purchase Receipt Item")
|
||||||
parent = frappe.qb.DocType("Purchase Receipt")
|
parent = frappe.qb.DocType("Purchase Receipt")
|
||||||
query = (
|
query = (
|
||||||
@@ -50,20 +51,98 @@ def execute():
|
|||||||
adjusted_amt = flt(
|
adjusted_amt = flt(
|
||||||
adjusted_amt * flt(item.conversion_rate),
|
adjusted_amt * flt(item.conversion_rate),
|
||||||
precision,
|
precision,
|
||||||
|
=======
|
||||||
|
for company in frappe.get_all("Company", pluck="name"):
|
||||||
|
table = frappe.qb.DocType("Purchase Receipt Item")
|
||||||
|
parent = frappe.qb.DocType("Purchase Receipt")
|
||||||
|
query = (
|
||||||
|
frappe.qb.from_(table)
|
||||||
|
.join(parent)
|
||||||
|
.on(table.parent == parent.name)
|
||||||
|
.select(
|
||||||
|
table.parent,
|
||||||
|
table.name,
|
||||||
|
table.amount,
|
||||||
|
table.billed_amt,
|
||||||
|
table.amount_difference_with_purchase_invoice,
|
||||||
|
table.rate,
|
||||||
|
table.qty,
|
||||||
|
parent.conversion_rate,
|
||||||
|
>>>>>>> 0492b941ff (fix: recalculate_amount_difference_field patch)
|
||||||
)
|
)
|
||||||
|
.where(
|
||||||
|
(table.amount_difference_with_purchase_invoice != 0)
|
||||||
|
& (table.docstatus == 1)
|
||||||
|
& (parent.company == company)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
if adjusted_amt != item.amount_difference_with_purchase_invoice:
|
posting_date = "2024-04-01"
|
||||||
frappe.db.set_value(
|
|
||||||
"Purchase Receipt Item",
|
# Get the last accounting period end date
|
||||||
item.name,
|
accounting_period = frappe.get_all(
|
||||||
"amount_difference_with_purchase_invoice",
|
"Accounting Period", {"company": company}, ["end_date"], order_by="end_date desc", limit=1
|
||||||
adjusted_amt,
|
)
|
||||||
update_modified=False,
|
if (
|
||||||
|
accounting_period
|
||||||
|
and accounting_period[0].end_date
|
||||||
|
and getdate(accounting_period[0].end_date) > getdate(posting_date)
|
||||||
|
):
|
||||||
|
posting_date = accounting_period[0].end_date
|
||||||
|
|
||||||
|
# Get the last period closing voucher end date
|
||||||
|
period_closing_voucher = frappe.get_all(
|
||||||
|
"Period Closing Voucher",
|
||||||
|
{"company": company, "docstatus": 1},
|
||||||
|
["period_end_date"],
|
||||||
|
order_by="period_end_date desc",
|
||||||
|
limit=1,
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
period_closing_voucher
|
||||||
|
and period_closing_voucher[0].period_end_date
|
||||||
|
and getdate(period_closing_voucher[0].period_end_date) > getdate(posting_date)
|
||||||
|
):
|
||||||
|
posting_date = period_closing_voucher[0].period_end_date
|
||||||
|
|
||||||
|
fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today(), raise_on_missing=False)
|
||||||
|
if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date):
|
||||||
|
posting_date = fiscal_year[1]
|
||||||
|
query = query.where(parent.posting_date > posting_date)
|
||||||
|
|
||||||
|
if result := query.run(as_dict=True):
|
||||||
|
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:
|
||||||
|
adjusted_amt = 0.0
|
||||||
|
|
||||||
|
if (
|
||||||
|
item.billed_amt is not None
|
||||||
|
and item.amount is not None
|
||||||
|
and item_wise_billed_qty.get(item.name)
|
||||||
|
):
|
||||||
|
adjusted_amt = (
|
||||||
|
flt(item.billed_amt / item_wise_billed_qty.get(item.name)) - flt(item.rate)
|
||||||
|
) * item.qty
|
||||||
|
adjusted_amt = flt(
|
||||||
|
adjusted_amt * flt(item.conversion_rate),
|
||||||
|
precision,
|
||||||
)
|
)
|
||||||
purchase_receipts.add(item.parent)
|
|
||||||
|
|
||||||
for pr in purchase_receipts:
|
if adjusted_amt != item.amount_difference_with_purchase_invoice:
|
||||||
adjust_incoming_rate_for_pr(frappe.get_doc("Purchase Receipt", pr))
|
frappe.db.set_value(
|
||||||
|
"Purchase Receipt Item",
|
||||||
|
item.name,
|
||||||
|
"amount_difference_with_purchase_invoice",
|
||||||
|
adjusted_amt,
|
||||||
|
update_modified=False,
|
||||||
|
)
|
||||||
|
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):
|
||||||
|
|||||||
Reference in New Issue
Block a user