From 1ee5ae1e2521f94096bca1de35d240d07938c963 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 6 Jan 2016 16:46:28 +0530 Subject: [PATCH] [fix] [minor] don't show cancelled sales orders --- .../selling/doctype/sales_order/sales_order.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 6ec82a2430..99e708d5b0 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -111,14 +111,14 @@ class SalesOrder(SellingController): def validate_warehouse(self): super(SalesOrder, self).validate_warehouse() - + for d in self.get("items"): if (frappe.db.get_value("Item", d.item_code, "is_stock_item")==1 or (self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))) \ and not d.warehouse and not cint(d.delivered_by_supplier): frappe.throw(_("Delivery warehouse required for stock item {0}").format(d.item_code), WarehouseRequired) - + def validate_with_previous_doc(self): super(SalesOrder, self).validate_with_previous_doc({ "Quotation": { @@ -285,8 +285,8 @@ class SalesOrder(SellingController): delivered_qty += item.delivered_qty tot_qty += item.qty - - frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100, + + frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100, update_modified=False) def get_list_context(context=None): @@ -518,7 +518,9 @@ def get_events(start, end, filters=None): data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date from `tabSales Order` where (ifnull(delivery_date, '0000-00-00')!= '0000-00-00') \ - and (delivery_date between %(start)s and %(end)s) {conditions} + and (delivery_date between %(start)s and %(end)s) + and docstatus < 2 + {conditions} """.format(conditions=conditions), { "start": start, "end": end @@ -533,7 +535,7 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") if default_price_list: target.buying_price_list = default_price_list - + if any( item.delivered_by_supplier==1 for item in source.items): if source.shipping_address_name: target.customer_address = source.shipping_address_name @@ -541,12 +543,12 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc= else: target.customer_address = source.customer_address target.customer_address_display = source.address_display - + target.customer_contact_person = source.contact_person target.customer_contact_display = source.contact_display target.customer_contact_mobile = source.contact_mobile target.customer_contact_email = source.contact_email - + else: target.customer = "" target.customer_name = ""