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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-04-08 08:51:58 +05:30
parent 67df5ae0ec
commit 2373dd9b95
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -1236,15 +1236,8 @@ class PaymentEntry(AccountsController):
if getdate(posting_date) < getdate(self.posting_date): if getdate(posting_date) < getdate(self.posting_date):
posting_date = self.posting_date posting_date = self.posting_date
<<<<<<< HEAD
dr_or_cr = (
"credit" if invoice.reference_doctype in ["Sales Invoice", "Payment Entry"] else "debit"
)
args_dict["account"] = invoice.account
=======
dr_or_cr, account = self.get_dr_and_account_for_advances(invoice) dr_or_cr, account = self.get_dr_and_account_for_advances(invoice)
args_dict["account"] = account args_dict["account"] = account
>>>>>>> 9fd2dddfde (fix: invalid ledger entries on payment against reverse payments)
args_dict[dr_or_cr] = invoice.allocated_amount args_dict[dr_or_cr] = invoice.allocated_amount
args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
args_dict.update( args_dict.update(

4
erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
View File

@@ -125,11 +125,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-08 07:40:38.487874",
=======
"modified": "2024-04-05 09:44:08.310593", "modified": "2024-04-05 09:44:08.310593",
>>>>>>> bdd36b0001 (refactor: supplementary field to better handle reverse payments)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry Reference", "name": "Payment Entry Reference",