chore: resolve conflicts

frappe · Sep 21, 2024 · f0b8a3c · f0b8a3c
1 parent 397f893
commit f0b8a3c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -109,11 +109,8 @@ def on_submit(self):
 		self.make_gl_entries()
 		self.update_outstanding_amounts()
 		self.update_payment_schedule()
-<<<<<<< HEAD
-=======
 		self.update_payment_requests()
 		self.update_advance_paid()  # advance_paid_status depends on the payment request amount
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
 		self.set_status()
 
 	def set_liability_account(self):
@@ -2634,11 +2631,7 @@ def get_payment_entry(
 	party_type=None,
 	payment_type=None,
 	reference_date=None,
-<<<<<<< HEAD
-=======
-	ignore_permissions=False,
 	created_from_payment_request=False,
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
 ):
 	doc = frappe.get_doc(dt, dn)
 	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -399,8 +399,6 @@
    "read_only": 1
   },
   {
-<<<<<<< HEAD
-=======
    "fieldname": "failed_reason",
    "fieldtype": "Data",
    "hidden": 1,
@@ -421,14 +419,11 @@
    "read_only": 1
   },
   {
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
    "options": "Company",
    "read_only": 1
-<<<<<<< HEAD
-=======
   },
   {
    "fieldname": "column_break_pnyv",
@@ -440,7 +435,6 @@
    "label": "Party Account Currency",
    "options": "Currency",
    "read_only": 1
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
   }
  ],
  "in_create": 1,
@@ -482,12 +476,8 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
  "show_preview_popup": 1,
- "sort_field": "creation",
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
+ "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
 }
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
@@ -1964,9 +1964,7 @@ def set_total_advance_paid(self):
 					).format(formatted_advance_paid, self.name, formatted_order_total)
 				)
 
-<<<<<<< HEAD
 			frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
-=======
 			self.db_set("advance_paid", advance_paid)
 
 		self.set_advance_payment_status()
@@ -1999,7 +1997,6 @@ def set_advance_payment_status(self):
 		self.db_set("advance_payment_status", new_status, update_modified=False)
 		self.set_status(update=True)
 		self.notify_update()
->>>>>>> 93f867570f (fix: multiple issues in Payment Request (#42427))
 
 	@property
 	def company_abbr(self):