diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 88b570c2d8a..0ad3de65896 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.57' +__version__ = '11.1.58' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 6e021d144d9..93f773a74e9 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -394,8 +394,8 @@ class SellingController(StockController): elif self.doctype == "Delivery Note": e = [d.item_code, d.description, d.warehouse, d.against_sales_order or d.against_sales_invoice, d.batch_no or ''] f = [d.item_code, d.description, d.against_sales_order or d.against_sales_invoice] - elif self.doctype == "Sales Order": - e = [d.item_code, d.description, d.warehouse, d.batch_no or ''] + elif self.doctype in ["Sales Order", "Quotation"]: + e = [d.item_code, d.description, d.warehouse, ''] f = [d.item_code, d.description] if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1: