nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 12:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38390 from GursheenK/payment-reco-currency-symbol

Browse Source 
fix: currency symbol in payment rec allocations
This commit is contained in:
Deepesh Garg
2023-11-29 17:22:12 +05:30
committed by GitHub
parent 190f77abff 6f44a1630f
commit 303becf1e3
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,7 @@ class PaymentReconciliation(Document):
"amount": pay.get("amount"), "amount": pay.get("amount"),
"allocated_amount": allocated_amount, "allocated_amount": allocated_amount,
"difference_amount": pay.get("difference_amount"), "difference_amount": pay.get("difference_amount"),
"currency": inv.get("currency"),
} }
) )

18
erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
View File

@@ -20,7 +20,8 @@
"section_break_5", "section_break_5",
"difference_amount", "difference_amount",
"column_break_7", "column_break_7",
"difference_account" "difference_account",
"currency"
], ],
"fields": [ "fields": [
{ {
@@ -37,7 +38,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Allocated Amount", "label": "Allocated Amount",
"options": "Currency", "options": "currency",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -112,7 +113,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 1, "hidden": 1,
"label": "Unreconciled Amount", "label": "Unreconciled Amount",
"options": "Currency", "options": "currency",
"read_only": 1 "read_only": 1
}, },
{ {
@@ -120,7 +121,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 1, "hidden": 1,
"label": "Amount", "label": "Amount",
"options": "Currency", "options": "currency",
"read_only": 1 "read_only": 1
}, },
{ {
@@ -129,11 +130,18 @@
"hidden": 1, "hidden": 1,
"label": "Reference Row", "label": "Reference Row",
"read_only": 1 "read_only": 1
},
{
"fieldname": "currency",
"fieldtype": "Link",
"hidden": 1,
"label": "Currency",
"options": "Currency"
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-10-06 11:48:59.616562", "modified": "2023-11-28 16:30:43.344612",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Allocation", "name": "Payment Reconciliation Allocation",