From 740db53b8650f6ddf06533030fe3fc93fba0a4f4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Aug 2015 12:00:16 +0530 Subject: [PATCH] [fix] returned_qty reapply and change-log --- .../purchase_order_item.json | 25 ++++++++++++++++++- .../current/collapsible_sections.md | 2 ++ .../sales_order_item/sales_order_item.json | 25 ++++++++++++++++++- .../stock/doctype/item_price/item_price.py | 1 - 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 erpnext/change_log/current/collapsible_sections.md diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index bcb2736820..f2079b6bb7 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -1099,6 +1099,29 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "returned_qty", + "fieldname": "returned_qty", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Returned Qty", + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -1177,7 +1200,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-08-26 12:01:42.690175", + "modified": "2015-08-27 02:29:53.767477", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/change_log/current/collapsible_sections.md b/erpnext/change_log/current/collapsible_sections.md new file mode 100644 index 0000000000..9c7fb30df1 --- /dev/null +++ b/erpnext/change_log/current/collapsible_sections.md @@ -0,0 +1,2 @@ +- Most transaction forms will now have collapsibe sections so that forms appear to be more organized and you can easily locate parts to be edited. +- The document title on most transactions can be edited so that you can set meaningful titles to all transactions like Sales Invoice and also edit it to denote status. diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index b0072c6d1d..8533ffaf75 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -919,6 +919,29 @@ "unique": 0, "width": "100px" }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "depends_on": "returned_qty", + "fieldname": "returned_qty", + "fieldtype": "Float", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Returned Qty", + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -1049,7 +1072,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-08-26 08:11:04.311184", + "modified": "2015-08-27 02:29:20.603580", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py index cc555f6ca3..6025ef7f9b 100644 --- a/erpnext/stock/doctype/item_price/item_price.py +++ b/erpnext/stock/doctype/item_price/item_price.py @@ -10,7 +10,6 @@ class ItemPriceDuplicateItem(frappe.ValidationError): pass from frappe.model.document import Document class ItemPrice(Document): - def validate(self): self.validate_item() self.validate_price_list()