Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23852 from frappe/pre-release

Browse Source 
fix: [revert] provision to draft quotation from portal
This commit is contained in:
Deepesh Garg 2020-11-06 17:59:00 +05:30 committed by GitHub
commit b4774ae65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/website_list_for_contact.py
View File

@ -25,7 +25,7 @@ def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_p
if not filters: filters = [] if not filters: filters = []
if doctype in ['Supplier Quotation', 'Purchase Invoice', 'Quotation']: if doctype in ['Supplier Quotation', 'Purchase Invoice']:
filters.append((doctype, 'docstatus', '<', 2)) filters.append((doctype, 'docstatus', '<', 2))
else: else:
filters.append((doctype, 'docstatus', '=', 1)) filters.append((doctype, 'docstatus', '=', 1))

2
erpnext/shopping_cart/cart.py
View File

@ -96,8 +96,6 @@ def place_order():
def request_for_quotation(): def request_for_quotation():
quotation = _get_cart_quotation() quotation = _get_cart_quotation()
quotation.flags.ignore_permissions = True quotation.flags.ignore_permissions = True
quotation.save()
if not get_shopping_cart_settings().save_quotations_as_draft:
quotation.submit() quotation.submit()
return quotation.name return quotation.name

9
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
View File

@ -167,20 +167,13 @@
"fieldname": "enable_variants", "fieldname": "enable_variants",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Enable Variants" "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", "icon": "fa fa-shopping-cart",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2020-09-24 16:28:07.192525", "modified": "2020-08-02 18:21:43.873303",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Shopping Cart", "module": "Shopping Cart",
"name": "Shopping Cart Settings", "name": "Shopping Cart Settings",

2
erpnext/templates/generators/item/item_add_to_cart.html
View File

@ -11,7 +11,7 @@
<small class="text-muted">({{ product_info.price.formatted_price }} / {{ product_info.uom }})</small> <small class="text-muted">({{ product_info.price.formatted_price }} / {{ product_info.uom }})</small>
</h4> </h4>
{% else %} {% else %}
{{ _("Unit of Measurement") }} : {{ product_info.uom }} {{ _("UOM") }} : {{ product_info.uom }}
{% endif %} {% endif %}
{% if cart_settings.show_stock_availability %} {% if cart_settings.show_stock_availability %}

4
erpnext/templates/includes/transaction_row.html
View File

@ -14,11 +14,7 @@
</div> </div>
</div> </div>
<div class="col-sm-3 text-right bold"> <div class="col-sm-3 text-right bold">
{% if doc.doctype == "Quotation" and not doc.docstatus %}
{{ _("Pending") }}
{% else %}
{{ doc.get_formatted("grand_total") }} {{ doc.get_formatted("grand_total") }}
{% endif %}
</div> </div>
</div> </div>
<a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a> <a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a>

5
erpnext/templates/pages/order.html
View File

@ -12,7 +12,7 @@
{% endblock %} {% endblock %}
{% block header_actions %} {% block header_actions %}
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span>{{ _('Actions') }}</span> <span>{{ _('Actions') }}</span>
<b class="caret"></b> <b class="caret"></b>
@ -26,7 +26,8 @@
{{ _("Print") }} {{ _("Print") }}
</a> </a>
</ul> </ul>
</div> </div>
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}