diff --git a/posawesome/__init__.py b/posawesome/__init__.py index 383f0a17..70bbeef5 100644 --- a/posawesome/__init__.py +++ b/posawesome/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = "3.5.0" +__version__ = "3.5.1" def console(*data): diff --git a/posawesome/posawesome/api/posapp.py b/posawesome/posawesome/api/posapp.py index 3c2bda5a..0bda9622 100644 --- a/posawesome/posawesome/api/posapp.py +++ b/posawesome/posawesome/api/posapp.py @@ -805,9 +805,11 @@ def get_item_detail(item, doc=None, warehouse=None, price_list=None): item = json.loads(item) item_code = item.get("item_code") if warehouse and item.get("has_batch_no") and not item.get("batch_no"): - item["batch_no"] = get_batch_no( + batch_no = get_batch_no( item_code, warehouse, item.get("qty"), False, item.get("d") ) + if batch_no: + item["batch_no"] = batch_no.get("batch_no") item["selling_price_list"] = price_list max_discount = frappe.get_value("Item", item_code, "max_discount") res = get_item_details( @@ -1517,7 +1519,7 @@ def set_payment_schedule(doc): base_payment_amount=base_grand_total, ) doc.append("payment_schedule", data) - frappe.msgprint(str(doc.outstanding_amount)) + for d in doc.get("payment_schedule"): if d.invoice_portion: d.payment_amount = flt( diff --git a/posawesome/public/js/posapp/components/pos/Invoice.vue b/posawesome/public/js/posapp/components/pos/Invoice.vue index 9fe01cd3..bdd89413 100644 --- a/posawesome/public/js/posapp/components/pos/Invoice.vue +++ b/posawesome/public/js/posapp/components/pos/Invoice.vue @@ -1399,7 +1399,6 @@ export default { currency: this.pos_profile.currency, // plc_conversion_rate: 1, pos_profile: this.pos_profile.name, - price_list: this.pos_profile.selling_price_list, uom: item.uom, tax_category: '', transaction_type: 'selling',