diff --git a/posawesome/__init__.py b/posawesome/__init__.py index 4ef7413f..7d4b9c2c 100644 --- a/posawesome/__init__.py +++ b/posawesome/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = "4.1.0" +__version__ = "4.1.1" def console(*data): diff --git a/posawesome/posawesome/api/posapp.py b/posawesome/posawesome/api/posapp.py index 00abeeaf..2d4521e3 100644 --- a/posawesome/posawesome/api/posapp.py +++ b/posawesome/posawesome/api/posapp.py @@ -862,9 +862,13 @@ def create_customer( ) if customer_group: customer.customer_group = customer_group + else: + customer.customer_group = "All Customer Groups" if territory: customer.territory = territory - customer.save(ignore_permissions=True) + else: + customer.territory = "All Territories" + customer.save() return customer diff --git a/posawesome/posawesome/doctype/pos_closing_shift/pos_closing_shift.py b/posawesome/posawesome/doctype/pos_closing_shift/pos_closing_shift.py index 6c55ab70..780fdff6 100644 --- a/posawesome/posawesome/doctype/pos_closing_shift/pos_closing_shift.py +++ b/posawesome/posawesome/doctype/pos_closing_shift/pos_closing_shift.py @@ -7,9 +7,7 @@ import json from frappe import _ from frappe.model.document import Document -from frappe.utils import getdate, get_datetime, flt -from collections import defaultdict -from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data +from frappe.utils import flt class POSClosingShift(Document): @@ -28,6 +26,14 @@ def validate(self): if frappe.db.get_value("POS Opening Shift", self.pos_opening_shift, "status") != "Open": frappe.throw(_("Selected POS Opening Shift should be open."), title=_( "Invalid Opening Entry")) + self.update_payment_reconciliation() + + def update_payment_reconciliation(self): + # update the difference values in Payment Reconciliation child table + # get default precision for site + precision = frappe.get_cached_value('System Settings', None, 'currency_precision') or 3 + for d in self.payment_reconciliation: + d.difference = flt(d.opening_amount, precision) + flt(d.closing_amount, precision) - flt(d.expected_amount, precision) def on_submit(self): opening_entry = frappe.get_doc(