From b0f000b1c8b182414d1cf0401de11adc0d26995c Mon Sep 17 00:00:00 2001 From: Rohan Date: Tue, 14 Apr 2020 19:42:21 +0530 Subject: [PATCH] fix: order_type validation restriction (#18096) (#21264) Co-authored-by: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com> --- erpnext/controllers/selling_controller.py | 7 ------- erpnext/selling/doctype/quotation/quotation.py | 4 ---- erpnext/selling/doctype/sales_order/sales_order.py | 4 ---- 3 files changed, 15 deletions(-) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 9dbd5be9188..9a9f3d1d319 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -148,13 +148,6 @@ class SellingController(StockController): if sales_team and total != 100.0: throw(_("Total allocated percentage for sales team should be 100")) - def validate_order_type(self): - valid_types = ["Sales", "Maintenance", "Shopping Cart"] - if not self.order_type: - self.order_type = "Sales" - elif self.order_type not in valid_types: - throw(_("Order Type must be one of {0}").format(comma_or(valid_types))) - def validate_max_discount(self): for d in self.get("items"): if d.item_code: diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 00471c762c8..1571c734b7f 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -26,7 +26,6 @@ class Quotation(SellingController): super(Quotation, self).validate() self.set_status() self.update_opportunity() - self.validate_order_type() self.validate_uom_is_integer("stock_uom", "qty") self.validate_valid_till() self.set_customer_name() @@ -40,9 +39,6 @@ class Quotation(SellingController): def has_sales_order(self): return frappe.db.get_value("Sales Order Item", {"prevdoc_docname": self.name, "docstatus": 1}) - def validate_order_type(self): - super(Quotation, self).validate_order_type() - def update_lead(self): if self.quotation_to == "Lead" and self.party_name: frappe.get_doc("Lead", self.party_name).set_status(update=True) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 19cf65dee86..ef2d19ac546 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -34,7 +34,6 @@ class SalesOrder(SellingController): def validate(self): super(SalesOrder, self).validate() - self.validate_order_type() self.validate_delivery_date() self.validate_proj_cust() self.validate_po() @@ -100,9 +99,6 @@ class SalesOrder(SellingController): frappe.msgprint(_("Quotation {0} not of type {1}") .format(d.prevdoc_docname, self.order_type)) - def validate_order_type(self): - super(SalesOrder, self).validate_order_type() - def validate_delivery_date(self): if self.order_type == 'Sales' and not self.skip_delivery_note: delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]