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

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2024-09-21 11:15:14 +05:30
parent 397f893da1
commit f0b8a3ca59
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,11 +109,8 @@ class PaymentEntry(AccountsController):
self.make_gl_entries() self.make_gl_entries()
self.update_outstanding_amounts() self.update_outstanding_amounts()
self.update_payment_schedule() self.update_payment_schedule()
<<<<<<< HEAD
=======
self.update_payment_requests() self.update_payment_requests()
self.update_advance_paid() # advance_paid_status depends on the payment request amount self.update_advance_paid() # advance_paid_status depends on the payment request amount
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
self.set_status() self.set_status()
def set_liability_account(self): def set_liability_account(self):
@@ -2634,11 +2631,7 @@ def get_payment_entry(
party_type=None, party_type=None,
payment_type=None, payment_type=None,
reference_date=None, reference_date=None,
<<<<<<< HEAD
=======
ignore_permissions=False,
created_from_payment_request=False, created_from_payment_request=False,
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
): ):
doc = frappe.get_doc(dt, dn) doc = frappe.get_doc(dt, dn)
over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance") over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")

12
erpnext/accounts/doctype/payment_request/payment_request.json
View File

@@ -399,8 +399,6 @@
"read_only": 1 "read_only": 1
}, },
{ {
<<<<<<< HEAD
=======
"fieldname": "failed_reason", "fieldname": "failed_reason",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
@@ -421,14 +419,11 @@
"read_only": 1 "read_only": 1
}, },
{ {
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Company", "label": "Company",
"options": "Company", "options": "Company",
"read_only": 1 "read_only": 1
<<<<<<< HEAD
=======
}, },
{ {
"fieldname": "column_break_pnyv", "fieldname": "column_break_pnyv",
@@ -440,7 +435,6 @@
"label": "Party Account Currency", "label": "Party Account Currency",
"options": "Currency", "options": "Currency",
"read_only": 1 "read_only": 1
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
} }
], ],
"in_create": 1, "in_create": 1,
@@ -482,12 +476,8 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified",
=======
"show_preview_popup": 1, "show_preview_popup": 1,
"sort_field": "creation", "sort_field": "modified",
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }

3
erpnext/controllers/accounts_controller.py
View File

@@ -1964,9 +1964,7 @@ class AccountsController(TransactionBase):
).format(formatted_advance_paid, self.name, formatted_order_total) ).format(formatted_advance_paid, self.name, formatted_order_total)
) )
<<<<<<< HEAD
frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid) frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
=======
self.db_set("advance_paid", advance_paid) self.db_set("advance_paid", advance_paid)
self.set_advance_payment_status() self.set_advance_payment_status()
@@ -1999,7 +1997,6 @@ class AccountsController(TransactionBase):
self.db_set("advance_payment_status", new_status, update_modified=False) self.db_set("advance_payment_status", new_status, update_modified=False)
self.set_status(update=True) self.set_status(update=True)
self.notify_update() self.notify_update()
>>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
@property @property
def company_abbr(self): def company_abbr(self):