From 19e8fb5c00d6f3add98c74166e82290248fa2f70 Mon Sep 17 00:00:00 2001 From: sonali8848 Date: Wed, 10 May 2023 14:10:47 +0530 Subject: [PATCH] fix:format of msg --- .../public/js/unicommerce/pick_list.js | 4 ++-- ecommerce_integrations/unicommerce/invoice.py | 9 +++------ .../unicommerce/pick_list.py | 20 ++++++++----------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ecommerce_integrations/public/js/unicommerce/pick_list.js b/ecommerce_integrations/public/js/unicommerce/pick_list.js index b7c1f07e..679bace9 100644 --- a/ecommerce_integrations/public/js/unicommerce/pick_list.js +++ b/ecommerce_integrations/public/js/unicommerce/pick_list.js @@ -1,12 +1,12 @@ frappe.ui.form.on('Pick List', { refresh(frm){ if (frm.doc.order_details){ - cur_frm.add_custom_button(__('Generate Invoice'), () => frm.trigger('generate_invoice')) + frm.add_custom_button(__('Generate Invoice'), () => frm.trigger('generate_invoice')) } }, generate_invoice(frm){ let selected_so = [] - var tbl = cur_frm.doc.order_details || []; + var tbl = frm.doc.order_details || []; for(var i = 0; i < tbl.length; i++) { selected_so.push(tbl[i].sales_order) } diff --git a/ecommerce_integrations/unicommerce/invoice.py b/ecommerce_integrations/unicommerce/invoice.py index 55e66601..8928b43c 100644 --- a/ecommerce_integrations/unicommerce/invoice.py +++ b/ecommerce_integrations/unicommerce/invoice.py @@ -606,12 +606,8 @@ def on_submit(self, method=None): ) else: frappe.db.set_value("Pick List Sales Order Details", pl.name, {"sales_invoice": self.name}) - is_invoice_generated = frappe.db.sql( - f"select name from `tabPick List Sales Order Details` where parent = '{pl.parent}' and" - " sales_invoice is null" - ) - if not is_invoice_generated: - frappe.db.set_value("Pick List", pl.parent, "workflow_state", "Invoice Generated") + + def on_cancel(self, method=None): @@ -620,3 +616,4 @@ def on_cancel(self, method=None): ) if results: self.flags.ignore_links = True + diff --git a/ecommerce_integrations/unicommerce/pick_list.py b/ecommerce_integrations/unicommerce/pick_list.py index d54eaea9..e83702ec 100644 --- a/ecommerce_integrations/unicommerce/pick_list.py +++ b/ecommerce_integrations/unicommerce/pick_list.py @@ -1,7 +1,7 @@ import json import frappe - +from frappe import _ def validate(self, method=None): if self.get("locations"): @@ -9,22 +9,15 @@ def validate(self, method=None): if pl.picked_qty and float(pl.picked_qty) > 0: if pl.picked_qty > pl.qty: pl.picked_qty = pl.qty - frappe.throw("Row " + str(pl.idx) + ": Picked Qty cannot be more than Sales Order Qty") - if pl.picked_qty == 0 and self.docstatus == 1: - frappe.throw( - "You have not picked " - + pl.item_code - + " in row " - + str(pl.idx) - + ". Pick the item to proceed!" - ) + + frappe.throw(_("Row {0} Picked Qty cannot be more than Sales Order Qty").format(pl.idx)) + if pl.picked_qty == 0 and pl.docstatus == 1: + frappe.throw(_("You have not picked {0} in row {1} . Pick the item to proceed!").format(pl.item_code,pl.idx)) item_so_list = [d.sales_order for d in self.get("locations")] unique_so_list = [] for i in item_so_list: if i not in unique_so_list: unique_so_list.append(i) - if len(unique_so_list) > 30: - frappe.throw("Cannot add more than 30 Sales Orders!") so_list = [d.sales_order for d in self.get("order_details")] for so in unique_so_list: if so not in so_list: @@ -52,3 +45,6 @@ def validate(self, method=None): for x in self.get("order_details"): if x.sales_order == so: x.pick_status = "Partially Picked" + + +