From 93243b1d95b7412ea307c16bf63c08193e17d5a2 Mon Sep 17 00:00:00 2001 From: Ahmed Shareef Date: Tue, 29 Oct 2024 11:07:58 +0400 Subject: [PATCH 1/2] fix: remarks field in payment reconciliation (cherry picked from commit 2d5b079949ce13a162686780c2b4cde5c7fb1071) # Conflicts: # erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json # erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py --- .../payment_reconciliation.py | 1 + .../payment_reconciliation_payment.json | 18 ++++++++----- .../payment_reconciliation_payment.py | 27 +++++++++++++++++++ erpnext/accounts/utils.py | 2 ++ 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 9480aeb7746..218add540d3 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -256,6 +256,7 @@ class PaymentReconciliation(Document): "posting_date": inv.posting_date, "currency": inv.currency, "cost_center": inv.cost_center, + "remarks": inv.remarks, } ) ) diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json index d199236ae99..8e3ff2288aa 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -14,7 +14,7 @@ "amount", "difference_amount", "sec_break1", - "remark", + "remarks", "currency", "exchange_rate", "cost_center" @@ -74,12 +74,6 @@ "fieldname": "sec_break1", "fieldtype": "Section Break" }, - { - "fieldname": "remark", - "fieldtype": "Small Text", - "label": "Remark", - "read_only": 1 - }, { "fieldname": "currency", "fieldtype": "Link", @@ -105,12 +99,22 @@ "fieldtype": "Link", "label": "Cost Center", "options": "Cost Center" + }, + { + "fieldname": "remarks", + "fieldtype": "Small Text", + "label": "Remarks", + "read_only": 1 } ], "is_virtual": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-11-17 17:33:34.818530", +======= + "modified": "2024-10-29 16:24:43.021230", +>>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Payment", diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py index 1c66b9b4cb5..e55d6a717b3 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py @@ -6,6 +6,33 @@ from frappe.model.document import Document class PaymentReconciliationPayment(Document): +<<<<<<< HEAD +======= + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + amount: DF.Currency + cost_center: DF.Link | None + currency: DF.Link | None + difference_amount: DF.Currency + exchange_rate: DF.Float + is_advance: DF.Data | None + parent: DF.Data + parentfield: DF.Data + parenttype: DF.Data + posting_date: DF.Date | None + reference_name: DF.DynamicLink | None + reference_row: DF.Data | None + reference_type: DF.Link | None + remarks: DF.SmallText | None + # end: auto-generated types + +>>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation) @staticmethod def get_list(args): pass diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index cb5b4479408..5bb453d3491 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -1930,6 +1930,7 @@ class QueryPaymentLedger: ple.cost_center.as_("cost_center"), Sum(ple.amount).as_("amount"), Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"), + ple.remarks, ) .where(ple.delinked == 0) .where(Criterion.all(filter_on_voucher_no)) @@ -1992,6 +1993,7 @@ class QueryPaymentLedger: Table("vouchers").due_date, Table("vouchers").currency, Table("vouchers").cost_center.as_("cost_center"), + Table("vouchers").remarks, ) .where(Criterion.all(filter_on_outstanding_amount)) ) From 15881ea71865cab1a4d61dad27df8d6c00b92daa Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 30 Oct 2024 10:28:30 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../payment_reconciliation_payment.json | 4 --- .../payment_reconciliation_payment.py | 27 ------------------- 2 files changed, 31 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json index 8e3ff2288aa..010e93558cf 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -110,11 +110,7 @@ "is_virtual": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-17 17:33:34.818530", -======= "modified": "2024-10-29 16:24:43.021230", ->>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Payment", diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py index e55d6a717b3..1c66b9b4cb5 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py @@ -6,33 +6,6 @@ from frappe.model.document import Document class PaymentReconciliationPayment(Document): -<<<<<<< HEAD -======= - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - amount: DF.Currency - cost_center: DF.Link | None - currency: DF.Link | None - difference_amount: DF.Currency - exchange_rate: DF.Float - is_advance: DF.Data | None - parent: DF.Data - parentfield: DF.Data - parenttype: DF.Data - posting_date: DF.Date | None - reference_name: DF.DynamicLink | None - reference_row: DF.Data | None - reference_type: DF.Link | None - remarks: DF.SmallText | None - # end: auto-generated types - ->>>>>>> 2d5b079949 (fix: remarks field in payment reconciliation) @staticmethod def get_list(args): pass