From 727a379581caf0ef3553f095beb835df73c3ec7b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 11 Aug 2023 09:10:10 +0530 Subject: [PATCH] chore: remove unwanted 'Reversal of ITC' and merge conflicts --- .../doctype/journal_entry/journal_entry.json | 2 +- .../payment_reconciliation.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json index 80df0ff0dff..cff84dc9252 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.json +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json @@ -89,7 +89,7 @@ "label": "Entry Type", "oldfieldname": "voucher_type", "oldfieldtype": "Select", - "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense\nReversal Of ITC", + "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nExchange Gain Or Loss\nDeferred Revenue\nDeferred Expense", "reqd": 1, "search_index": 1 }, diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 91c79ed1f8b..05623c09932 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -640,11 +640,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company): "reference_type": inv.against_voucher_type, "reference_name": inv.against_voucher, "cost_center": erpnext.get_default_cost_center(company), -<<<<<<< HEAD -======= - "exchange_rate": inv.exchange_rate, "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} against {inv.against_voucher}", ->>>>>>> 47cb349362 (fix: better remarks on Cr note created by Reconciliation) }, { "account": inv.account, @@ -658,11 +654,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company): "reference_type": inv.voucher_type, "reference_name": inv.voucher_no, "cost_center": erpnext.get_default_cost_center(company), -<<<<<<< HEAD -======= - "exchange_rate": inv.exchange_rate, "user_remark": f"{fmt_money(flt(inv.allocated_amount), currency=company_currency)} from {inv.voucher_no}", ->>>>>>> 47cb349362 (fix: better remarks on Cr note created by Reconciliation) }, ], } @@ -672,14 +664,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company): jv.append("accounts", difference_entry) jv.flags.ignore_mandatory = True -<<<<<<< HEAD -======= - jv.flags.ignore_exchange_rate = True jv.remark = None jv.flags.skip_remarks_creation = True -<<<<<<< HEAD ->>>>>>> 47cb349362 (fix: better remarks on Cr note created by Reconciliation) -======= jv.is_system_generated = True ->>>>>>> 3997aa77d4 (refactor: add `is_system_generated` field to Journal Entry) jv.submit()