diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index a9734bf18a..f7497072c4 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -381,14 +381,14 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "description": "Customer's Purchase Order Number", + "description": "", "fieldname": "po_no", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "PO No", + "label": "Customer's Purchase Order", "no_copy": 0, "oldfieldname": "po_no", "oldfieldtype": "Data", @@ -407,14 +407,14 @@ "bold": 0, "collapsible": 0, "depends_on": "eval:doc.po_no", - "description": "Customer's Purchase Order Date", + "description": "", "fieldname": "po_date", "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "PO Date", + "label": "Customer's Purchase Order Date", "no_copy": 0, "oldfieldname": "po_date", "oldfieldtype": "Date", @@ -2553,7 +2553,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-08-26 08:31:08.753604", + "modified": "2015-08-27 02:44:24.437994", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 53969e810f..44ea6649ff 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -36,7 +36,7 @@ class SalesOrder(SellingController): and customer = %s", (self.po_no, self.name, self.customer)) if so and so[0][0] and not \ cint(frappe.db.get_single_value("Selling Settings", "allow_against_multiple_purchase_orders")): - frappe.msgprint(_("Warning: Sales Order {0} already exists against same Purchase Order number").format(so[0][0])) + frappe.msgprint(_("Warning: Sales Order {0} already exists against Customer's Purchase Order {1}").format(so[0][0], self.po_no)) def validate_for_items(self): check_list = [] @@ -228,7 +228,7 @@ class SalesOrder(SellingController): frappe.db.set(self, 'status', 'Submitted') self.update_reserved_qty() frappe.msgprint(_("{0} {1} status is Unstopped").format(self.doctype, self.name)) - + def update_reserved_qty(self, so_item_rows=None): """update requested qty (before ordered_qty is updated)""" item_wh_list = [] @@ -236,11 +236,11 @@ class SalesOrder(SellingController): if item_code and warehouse and [item_code, warehouse] not in item_wh_list \ and frappe.db.get_value("Item", item_code, "is_stock_item"): item_wh_list.append([item_code, warehouse]) - + for d in self.get("items"): if (not so_item_rows or d.name in so_item_rows): _valid_for_reserve(d.item_code, d.warehouse) - + if self.has_product_bundle(d.item_code): for p in self.get("packed_items"): if p.parent_detail_docname == d.name and p.parent_item == d.item_code: diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 30d7e51544..affa38b88b 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -11,6 +11,8 @@ "fields": [ { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "default": "Customer Name", "fieldname": "cust_master_name", "fieldtype": "Select", @@ -32,6 +34,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "campaign_naming_by", "fieldtype": "Select", "hidden": 0, @@ -52,6 +56,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "description": "", "fieldname": "customer_group", "fieldtype": "Link", @@ -73,6 +79,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "description": "", "fieldname": "territory", "fieldtype": "Link", @@ -94,6 +102,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "selling_price_list", "fieldtype": "Link", "hidden": 0, @@ -114,6 +124,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "column_break_5", "fieldtype": "Column Break", "hidden": 0, @@ -132,6 +144,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "so_required", "fieldtype": "Select", "hidden": 0, @@ -152,6 +166,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "dn_required", "fieldtype": "Select", "hidden": 0, @@ -172,6 +188,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "maintain_same_sales_rate", "fieldtype": "Check", "hidden": 0, @@ -191,6 +209,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "editable_price_list_rate", "fieldtype": "Check", "hidden": 0, @@ -210,6 +230,8 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "allow_multiple_items", "fieldtype": "Check", "hidden": 0, @@ -230,13 +252,15 @@ }, { "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, "fieldname": "allow_against_multiple_purchase_orders", "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "Allow multiple Sales Orders against a Supplier Purchase Order", + "label": "Allow multiple Sales Orders against a Customer's Purchase Order", "no_copy": 0, "permlevel": 0, "precision": "", @@ -258,7 +282,7 @@ "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-08-25 04:52:06.879614", + "modified": "2015-08-27 02:42:56.512460", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings",