nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 07:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unwanted 'Reversal of ITC' and merge conflicts

Browse Source
This commit is contained in:
ruthra kumar
2023-08-11 09:10:10 +05:30
parent a04471024d
commit 727a379581
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

@@ -89,7 +89,7 @@
"label": "Entry Type", "label": "Entry Type",
"oldfieldname": "voucher_type", "oldfieldname": "voucher_type",
"oldfieldtype": "Select", "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, "reqd": 1,
"search_index": 1 "search_index": 1
}, },

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

@@ -640,11 +640,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
"reference_type": inv.against_voucher_type, "reference_type": inv.against_voucher_type,
"reference_name": inv.against_voucher, "reference_name": inv.against_voucher,
"cost_center": erpnext.get_default_cost_center(company), "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}", "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, "account": inv.account,
@@ -658,11 +654,7 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
"reference_type": inv.voucher_type, "reference_type": inv.voucher_type,
"reference_name": inv.voucher_no, "reference_name": inv.voucher_no,
"cost_center": erpnext.get_default_cost_center(company), "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}", "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.append("accounts", difference_entry)
jv.flags.ignore_mandatory = True jv.flags.ignore_mandatory = True
<<<<<<< HEAD
=======
jv.flags.ignore_exchange_rate = True
jv.remark = None jv.remark = None
jv.flags.skip_remarks_creation = True jv.flags.skip_remarks_creation = True
<<<<<<< HEAD
>>>>>>> 47cb349362 (fix: better remarks on Cr note created by Reconciliation)
=======
jv.is_system_generated = True jv.is_system_generated = True
>>>>>>> 3997aa77d4 (refactor: add `is_system_generated` field to Journal Entry)
jv.submit() jv.submit()