From 5ce4dae204cedb0e9f74b8820ae3250abf770ab2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 23 Sep 2024 20:02:10 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/pos_invoice/pos_invoice.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py index 899b9aa8f0c8..80c4db50acb2 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py @@ -381,19 +381,8 @@ def validate_payment_amount(self): if self.is_return and self.docstatus != 0: invoice_total = self.rounded_total or self.grand_total -<<<<<<< HEAD if total_amount_in_payments and total_amount_in_payments < invoice_total: frappe.throw(_("Total payments amount can't be greater than {}").format(-invoice_total)) -======= - total_amount_in_payments = flt(total_amount_in_payments, self.precision("grand_total")) -<<<<<<< HEAD - if total_amount_in_payments and total_amount_in_payments > invoice_total: - frappe.throw(_("Total payments amount can't be greater than {}").format(invoice_total)) ->>>>>>> 76289fa8dc (fix: partial return on POS invoice) -======= - if total_amount_in_payments and total_amount_in_payments < invoice_total: - frappe.throw(_("Total payments amount can't be greater than {}").format(-invoice_total)) ->>>>>>> 18bdd06652 (fix: partial return on POS invoice) def validate_company_with_pos_company(self): if self.company != frappe.db.get_value("POS Profile", self.pos_profile, "company"):