Skip to content

Commit

Permalink
chore: resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ruthra-kumar committed Sep 23, 2024
1 parent 50e0f56 commit 5ce4dae
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions erpnext/accounts/doctype/pos_invoice/pos_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down

0 comments on commit 5ce4dae

Please sign in to comment.