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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-09-23 20:02:10 +05:30
parent 50e0f56d18
commit 5ce4dae204
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View File

@@ -381,19 +381,8 @@ class POSInvoice(SalesInvoice):
if self.is_return and self.docstatus != 0: if self.is_return and self.docstatus != 0:
invoice_total = self.rounded_total or self.grand_total invoice_total = self.rounded_total or self.grand_total
<<<<<<< HEAD
if total_amount_in_payments and total_amount_in_payments < invoice_total: 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)) 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): def validate_company_with_pos_company(self):
if self.company != frappe.db.get_value("POS Profile", self.pos_profile, "company"): if self.company != frappe.db.get_value("POS Profile", self.pos_profile, "company"):