CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 02:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fiscal year error

Browse Source 
(cherry picked from commit 7cf8e498c4)
This commit is contained in:
Mihir Kandoi
2025-02-17 18:44:33 +05:30
committed by Mergify
parent ee41e55343
commit 7b13d8cd98
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import adjust_incom
def execute(): def execute():
fiscal_year_dates = get_fiscal_year(frappe.utils.datetime.date.today())
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 = (
@@ -24,12 +23,10 @@ def execute():
table.qty, table.qty,
parent.conversion_rate, parent.conversion_rate,
) )
.where( .where((table.amount_difference_with_purchase_invoice != 0) & (table.docstatus == 1))
(table.amount_difference_with_purchase_invoice != 0)
& (table.docstatus == 1)
& (parent.posting_date.between(fiscal_year_dates[1], fiscal_year_dates[2]))
)
) )
if fiscal_year_dates := get_fiscal_year(frappe.utils.datetime.date.today(), raise_on_missing=False):
query.where(parent.posting_date.between(fiscal_year_dates[1], fiscal_year_dates[2]))
result = query.run(as_dict=True) 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])

1
erpnext/stock/doctype/purchase_receipt_item/patches/rename_field_from_rate_difference_to_amount_difference.py
View File

@@ -13,5 +13,6 @@ def execute():
"Purchase Receipt Item", "Purchase Receipt Item",
"rate_difference_with_purchase_invoice", "rate_difference_with_purchase_invoice",
"amount_difference_with_purchase_invoice", "amount_difference_with_purchase_invoice",
validate=False,
) )
frappe.clear_cache(doctype="Purchase Receipt Item") frappe.clear_cache(doctype="Purchase Receipt Item")