From 886b680e1b050548aabeacf8aac4833ced60aa35 Mon Sep 17 00:00:00 2001 From: Anupam Date: Fri, 6 Nov 2020 16:48:39 +0530 Subject: [PATCH] revert changes --- .../controllers/website_list_for_contact.py | 2 +- erpnext/crm/doctype/parameter/__init__.py | 0 erpnext/crm/doctype/parameter/parameter.js | 8 +++ erpnext/crm/doctype/parameter/parameter.json | 56 +++++++++++++++++++ erpnext/crm/doctype/parameter/parameter.py | 10 ++++ .../crm/doctype/parameter/test_parameter.py | 10 ++++ erpnext/shopping_cart/cart.py | 4 +- .../shopping_cart_settings.json | 9 +-- .../templates/includes/transaction_row.html | 6 +- erpnext/templates/pages/order.html | 31 +++++----- 10 files changed, 104 insertions(+), 32 deletions(-) create mode 100644 erpnext/crm/doctype/parameter/__init__.py create mode 100644 erpnext/crm/doctype/parameter/parameter.js create mode 100644 erpnext/crm/doctype/parameter/parameter.json create mode 100644 erpnext/crm/doctype/parameter/parameter.py create mode 100644 erpnext/crm/doctype/parameter/test_parameter.py diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py index 801c405732c..ecf041efd17 100644 --- a/erpnext/controllers/website_list_for_contact.py +++ b/erpnext/controllers/website_list_for_contact.py @@ -25,7 +25,7 @@ def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_p if not filters: filters = [] - if doctype in ['Supplier Quotation', 'Purchase Invoice', 'Quotation']: + if doctype in ['Supplier Quotation', 'Purchase Invoice']: filters.append((doctype, 'docstatus', '<', 2)) else: filters.append((doctype, 'docstatus', '=', 1)) diff --git a/erpnext/crm/doctype/parameter/__init__.py b/erpnext/crm/doctype/parameter/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/crm/doctype/parameter/parameter.js b/erpnext/crm/doctype/parameter/parameter.js new file mode 100644 index 00000000000..0a2b13be5ef --- /dev/null +++ b/erpnext/crm/doctype/parameter/parameter.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Parameter', { + // refresh: function(frm) { + + // } +}); diff --git a/erpnext/crm/doctype/parameter/parameter.json b/erpnext/crm/doctype/parameter/parameter.json new file mode 100644 index 00000000000..7b2eb3edfc7 --- /dev/null +++ b/erpnext/crm/doctype/parameter/parameter.json @@ -0,0 +1,56 @@ +{ + "actions": [], + "creation": "2020-11-02 16:04:08.280141", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "parameter_name", + "value_based", + "uom" + ], + "fields": [ + { + "fieldname": "parameter_name", + "fieldtype": "Data", + "label": "Parameter Name" + }, + { + "default": "0", + "fieldname": "value_based", + "fieldtype": "Check", + "label": "Value Based" + }, + { + "fieldname": "uom", + "fieldtype": "Link", + "label": "UOM", + "options": "UOM" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2020-11-02 16:04:08.280141", + "modified_by": "Administrator", + "module": "CRM", + "name": "Parameter", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/erpnext/crm/doctype/parameter/parameter.py b/erpnext/crm/doctype/parameter/parameter.py new file mode 100644 index 00000000000..9943bc45b91 --- /dev/null +++ b/erpnext/crm/doctype/parameter/parameter.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class Parameter(Document): + pass diff --git a/erpnext/crm/doctype/parameter/test_parameter.py b/erpnext/crm/doctype/parameter/test_parameter.py new file mode 100644 index 00000000000..80bb8652c0a --- /dev/null +++ b/erpnext/crm/doctype/parameter/test_parameter.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestParameter(unittest.TestCase): + pass diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index 0ccc0252c31..a7e8388be9d 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -96,9 +96,7 @@ def place_order(): def request_for_quotation(): quotation = _get_cart_quotation() quotation.flags.ignore_permissions = True - quotation.save() - if not get_shopping_cart_settings().save_quotations_as_draft: - quotation.submit() + 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 9d61e7d0ece..98a7eeda23c 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 @@ -167,20 +167,13 @@ "fieldname": "enable_variants", "fieldtype": "Check", "label": "Enable Variants" - }, - { - "default": "0", - "depends_on": "eval: doc.enable_checkout == 0", - "fieldname": "save_quotations_as_draft", - "fieldtype": "Check", - "label": "Save Quotations as Draft" } ], "icon": "fa fa-shopping-cart", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-09-24 16:28:07.192525", + "modified": "2020-08-02 18:21:43.873303", "modified_by": "Administrator", "module": "Shopping Cart", "name": "Shopping Cart Settings", diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html index fd4835ed99e..80a542f74bf 100644 --- a/erpnext/templates/includes/transaction_row.html +++ b/erpnext/templates/includes/transaction_row.html @@ -14,11 +14,7 @@
- {% if doc.doctype == "Quotation" and not doc.docstatus %} - {{ _("Pending") }} - {% else %} - {{ doc.get_formatted("grand_total") }} - {% endif %} + {{ doc.get_formatted("grand_total") }}
Link diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index af7af11677e..896954a287f 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -12,21 +12,22 @@ {% endblock %} {% block header_actions %} -
- - -
+
+ + +
+ {% endblock %} {% block page_content %}