nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-22 10:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
ljain112
2025-04-01 18:51:10 +05:30
parent 6f94ba599b
commit bde55d2a07
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -809,11 +809,7 @@
"table_fieldname": "payment_entries" "table_fieldname": "payment_entries"
} }
], ],
<<<<<<< HEAD
"modified": "2025-01-31 17:27:28.555246",
=======
"modified": "2025-03-24 16:18:19.920701", "modified": "2025-03-24 16:18:19.920701",
>>>>>>> 8c9d630ee4 (Merge pull request #46683 from Abdeali099/set-employee-contact-details)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry", "name": "Payment Entry",

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

@@ -444,25 +444,16 @@ class PaymentEntry(AccountsController):
self.party_name = frappe.db.get_value(self.party_type, self.party, "name") self.party_name = frappe.db.get_value(self.party_type, self.party, "name")
if self.party: if self.party:
<<<<<<< HEAD
if not self.contact_person:
set_contact_details(
self, party=frappe._dict({"name": self.party}), party_type=self.party_type
)
else:
complete_contact_details(self)
if not self.party_balance:
self.party_balance = get_balance_on(
party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company
)
=======
if self.party_type == "Employee": if self.party_type == "Employee":
self.contact_person = None self.contact_person = None
elif not self.contact_person: elif not self.contact_person:
self.contact_person = get_default_contact(self.party_type, self.party) self.contact_person = get_default_contact(self.party_type, self.party)
complete_contact_details(self) complete_contact_details(self)
>>>>>>> 8c9d630ee4 (Merge pull request #46683 from Abdeali099/set-employee-contact-details) if not self.party_balance:
self.party_balance = get_balance_on(
party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company
)
if not self.party_account: if not self.party_account:
party_account = get_party_account(self.party_type, self.party, self.company) party_account = get_party_account(self.party_type, self.party, self.company)