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

fix: remarks field in payment reconciliation

Browse Source
This commit is contained in:
Ahmed Shareef
2024-10-29 11:07:58 +04:00
parent adba1168c1
commit 2d5b079949
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@@ -323,6 +323,7 @@ class PaymentReconciliation(Document):
"posting_date": inv.posting_date, "posting_date": inv.posting_date,
"currency": inv.currency, "currency": inv.currency,
"cost_center": inv.cost_center, "cost_center": inv.cost_center,
"remarks": inv.remarks,
} }
) )
) )

16
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
View File

@@ -14,7 +14,7 @@
"amount", "amount",
"difference_amount", "difference_amount",
"sec_break1", "sec_break1",
"remark", "remarks",
"currency", "currency",
"exchange_rate", "exchange_rate",
"cost_center" "cost_center"
@@ -74,12 +74,6 @@
"fieldname": "sec_break1", "fieldname": "sec_break1",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
{
"fieldname": "remark",
"fieldtype": "Small Text",
"label": "Remark",
"read_only": 1
},
{ {
"fieldname": "currency", "fieldname": "currency",
"fieldtype": "Link", "fieldtype": "Link",
@@ -105,12 +99,18 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Cost Center", "label": "Cost Center",
"options": "Cost Center" "options": "Cost Center"
},
{
"fieldname": "remarks",
"fieldtype": "Small Text",
"label": "Remarks",
"read_only": 1
} }
], ],
"is_virtual": 1, "is_virtual": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-03-27 13:10:10.980445", "modified": "2024-10-29 16:24:43.021230",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Payment", "name": "Payment Reconciliation Payment",

2
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
View File

@@ -27,7 +27,7 @@ class PaymentReconciliationPayment(Document):
reference_name: DF.DynamicLink | None reference_name: DF.DynamicLink | None
reference_row: DF.Data | None reference_row: DF.Data | None
reference_type: DF.Link | None reference_type: DF.Link | None
remark: DF.SmallText | None remarks: DF.SmallText | None
# end: auto-generated types # end: auto-generated types
@staticmethod @staticmethod

2
erpnext/accounts/utils.py
View File

@@ -1997,6 +1997,7 @@ class QueryPaymentLedger:
ple.cost_center.as_("cost_center"), ple.cost_center.as_("cost_center"),
Sum(ple.amount).as_("amount"), Sum(ple.amount).as_("amount"),
Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"), Sum(ple.amount_in_account_currency).as_("amount_in_account_currency"),
ple.remarks,
) )
.where(ple.delinked == 0) .where(ple.delinked == 0)
.where(Criterion.all(filter_on_voucher_no)) .where(Criterion.all(filter_on_voucher_no))
@@ -2059,6 +2060,7 @@ class QueryPaymentLedger:
Table("vouchers").due_date, Table("vouchers").due_date,
Table("vouchers").currency, Table("vouchers").currency,
Table("vouchers").cost_center.as_("cost_center"), Table("vouchers").cost_center.as_("cost_center"),
Table("vouchers").remarks,
) )
.where(Criterion.all(filter_on_outstanding_amount)) .where(Criterion.all(filter_on_outstanding_amount))
) )