mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-14 04:15:10 +00:00
feat(payment-reconciliation): add posting date field for debit/credit note auto jv creation
(cherry picked from commit 6b4004b127)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
This commit is contained in:
@@ -576,6 +576,7 @@ class PaymentReconciliation(Document):
|
|||||||
"difference_amount": flt(row.get("difference_amount")),
|
"difference_amount": flt(row.get("difference_amount")),
|
||||||
"difference_account": row.get("difference_account"),
|
"difference_account": row.get("difference_account"),
|
||||||
"difference_posting_date": row.get("gain_loss_posting_date"),
|
"difference_posting_date": row.get("gain_loss_posting_date"),
|
||||||
|
"debit_or_credit_note_posting_date": row.get("debit_or_credit_note_posting_date"),
|
||||||
"cost_center": row.get("cost_center"),
|
"cost_center": row.get("cost_center"),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -765,7 +766,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company, active_dimensions=None):
|
|||||||
{
|
{
|
||||||
"doctype": "Journal Entry",
|
"doctype": "Journal Entry",
|
||||||
"voucher_type": voucher_type,
|
"voucher_type": voucher_type,
|
||||||
"posting_date": today(),
|
"posting_date": inv.get("debit_or_credit_note_posting_date") or today(),
|
||||||
"company": company,
|
"company": company,
|
||||||
"multi_currency": 1 if inv.currency != company_currency else 0,
|
"multi_currency": 1 if inv.currency != company_currency else 0,
|
||||||
"accounts": [
|
"accounts": [
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
"section_break_5",
|
"section_break_5",
|
||||||
"difference_amount",
|
"difference_amount",
|
||||||
"gain_loss_posting_date",
|
"gain_loss_posting_date",
|
||||||
|
"debit_or_credit_note_posting_date",
|
||||||
"column_break_7",
|
"column_break_7",
|
||||||
"difference_account",
|
"difference_account",
|
||||||
"exchange_rate",
|
"exchange_rate",
|
||||||
@@ -168,12 +169,17 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "dimension_col_break",
|
"fieldname": "dimension_col_break",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "debit_or_credit_note_posting_date",
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"label": "Debit / Credit Note Posting Date"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"is_virtual": 1,
|
"is_virtual": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2023-12-14 13:38:26.104150",
|
"modified": "2025-08-20 19:12:50.406769",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Payment Reconciliation Allocation",
|
"name": "Payment Reconciliation Allocation",
|
||||||
@@ -183,4 +189,4 @@
|
|||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
"states": [],
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class PaymentReconciliationAllocation(Document):
|
|||||||
amount: DF.Currency
|
amount: DF.Currency
|
||||||
cost_center: DF.Link | None
|
cost_center: DF.Link | None
|
||||||
currency: DF.Link | None
|
currency: DF.Link | None
|
||||||
|
debit_or_credit_note_posting_date: DF.Date | None
|
||||||
difference_account: DF.Link | None
|
difference_account: DF.Link | None
|
||||||
difference_amount: DF.Currency
|
difference_amount: DF.Currency
|
||||||
exchange_rate: DF.Float
|
exchange_rate: DF.Float
|
||||||
|
|||||||
Reference in New Issue
Block a user