From 78ee75d744cac330267a7d21dec794b181e5bb30 Mon Sep 17 00:00:00 2001 From: Anupam Date: Thu, 24 Sep 2020 16:17:02 +0530 Subject: [PATCH] fix: review changes --- erpnext/shopping_cart/cart.py | 4 +++- .../shopping_cart_settings/shopping_cart_settings.json | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index 414b3defe7..9439f6af4c 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -96,7 +96,9 @@ def place_order(): def request_for_quotation(): quotation = _get_cart_quotation() quotation.flags.ignore_permissions = True - quotation.save() if get_shopping_cart_settings().draft_quotation else quotation.submit() + quotation.save() + if not get_shopping_cart_settings().draft_quotation: + quotation.submit() return quotation.name @frappe.whitelist() diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json index b3286edc15..2a7b86bdae 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json @@ -12,7 +12,6 @@ "show_price", "show_stock_availability", "enable_variants", - "draft_quotation", "column_break_7", "show_contact_us_button", "show_quantity_in_website", @@ -28,6 +27,7 @@ "enable_checkout", "payment_success_url", "column_break_11", + "draft_quotation", "payment_gateway_account" ], "fields": [ @@ -173,14 +173,14 @@ "depends_on": "eval: doc.enable_checkout == 0", "fieldname": "draft_quotation", "fieldtype": "Check", - "label": "Draft Quotation" + "label": "Save Quotations as Draft" } ], "icon": "fa fa-shopping-cart", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-09-23 13:18:09.057707", + "modified": "2020-09-24 16:07:04.862183", "modified_by": "Administrator", "module": "Shopping Cart", "name": "Shopping Cart Settings",