chore: Item Price and Product Bundle Form cleanup (#20772)

* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -245,7 +245,7 @@ def filter_pricing_rules(args, pricing_rules, doc=None):
 
 def validate_quantity_and_amount_for_suggestion(args, qty, amount, item_code, transaction_type):
 	fieldname, msg = '', ''
-	type_of_transaction = 'purcahse' if transaction_type == "buying" else "sale"
+	type_of_transaction = 'purchase' if transaction_type == 'buying' else 'sale'
 
 	for field, value in {'min_qty': qty, 'min_amt': amount}.items():
 		if (args.get(field) and value < args.get(field)

erpnext/selling/doctype/product_bundle_item/product_bundle_item.json

@@ -1,189 +1,76 @@
 {
- "allow_copy": 0, 
+ "actions": [],
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
  "creation": "2013-05-23 16:55:51",
- "custom": 0, 
- "docstatus": 0, 
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "qty",
+  "description",
+  "rate",
+  "uom"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "item_code",
    "fieldtype": "Link",
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_global_search": 1,
    "in_list_view": 1,
-   "in_standard_filter": 0, 
    "label": "Item",
-   "length": 0, 
-   "no_copy": 0, 
    "oldfieldname": "item_code",
    "oldfieldtype": "Link",
    "options": "Item",
-   "permlevel": 0, 
+   "reqd": 1
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "qty",
    "fieldtype": "Float",
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1,
-   "in_standard_filter": 0, 
    "label": "Qty",
-   "length": 0, 
-   "no_copy": 0, 
    "oldfieldname": "qty",
    "oldfieldtype": "Currency",
-   "permlevel": 0, 
+   "reqd": 1
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "description",
    "fieldtype": "Text Editor",
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
    "in_list_view": 1,
-   "in_standard_filter": 0, 
    "label": "Description",
-   "length": 0, 
-   "no_copy": 0, 
    "oldfieldname": "description",
    "oldfieldtype": "Text",
-   "permlevel": 0, 
+   "print_width": "300px"
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "rate",
    "fieldtype": "Float",
    "hidden": 1,
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
    "label": "Rate",
-   "length": 0, 
-   "no_copy": 0, 
    "oldfieldname": "rate",
    "oldfieldtype": "Currency",
-   "permlevel": 0, 
+   "print_hide": 1
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "uom",
    "fieldtype": "Link",
-   "hidden": 0, 
+   "in_list_view": 1,
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
    "label": "UOM",
-   "length": 0, 
-   "no_copy": 0, 
    "oldfieldname": "uom",
    "oldfieldtype": "Link",
    "options": "UOM",
-   "permlevel": 0, 
+   "read_only": 1
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ],
- "hide_heading": 0, 
- "hide_toolbar": 0, 
  "idx": 1,
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
  "istable": 1,
- "max_attachments": 0, 
+ "links": [],
- "modified": "2017-02-20 13:24:05.633546", 
+ "modified": "2020-02-28 14:06:05.725655",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Product Bundle Item",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0, 
+ "sort_field": "modified",
- "read_only": 0, 
+ "sort_order": "DESC",
- "read_only_onload": 0, 
+ "track_changes": 1
- "show_name_in_global_search": 0, 
- "track_changes": 1, 
- "track_seen": 0
 }

erpnext/stock/doctype/item_price/item_price.json

@@ -10,7 +10,6 @@
   "item_code",
   "uom",
   "packing_unit",
-  "min_qty",
   "column_break_17",
   "item_name",
   "brand",
@@ -63,13 +62,6 @@
    "fieldtype": "Int",
    "label": "Packing Unit"
   },
-  {
-   "default": "1",
-   "fieldname": "min_qty",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Minimum Qty "
-  },
   {
    "fieldname": "column_break_17",
    "fieldtype": "Column Break"
@@ -216,7 +208,7 @@
  "icon": "fa fa-flag",
  "idx": 1,
  "links": [],
- "modified": "2019-12-31 03:11:09.702250",
+ "modified": "2020-02-28 14:21:25.580331",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Price",
@@ -251,6 +243,7 @@
   }
  ],
  "quick_entry": 1,
+ "sort_field": "modified",
  "sort_order": "ASC",
  "title_field": "item_name",
  "track_changes": 1

erpnext/stock/doctype/item_price/test_records.json

@@ -4,7 +4,6 @@
   "item_code": "_Test Item",
   "price_list": "_Test Price List",
   "price_list_rate": 100,
-  "min_qty": 2,
   "valid_from": "2017-04-18",
   "valid_upto": "2017-04-26"
  },
@@ -12,8 +11,7 @@
   "doctype": "Item Price",
   "item_code": "_Test Item",
   "price_list": "_Test Price List Rest of the World",
-  "price_list_rate": 10,
+  "price_list_rate": 10
-  "min_qty": 5
  },
  {
   "doctype": "Item Price",
@@ -22,7 +20,6 @@
   "price_list_rate": 20,
   "valid_from": "2017-04-18",
   "valid_upto": "2017-04-26",
-  "min_qty": 7,
   "customer": "_Test Customer",
   "uom": "_Test UOM"
  },
@@ -31,19 +28,15 @@
   "item_code": "_Test Item Home Desktop 100",
   "price_list": "_Test Price List",
   "price_list_rate": 1000,
-  "min_qty" : 10,
   "valid_from": "2017-04-10",
-  "valid_upto": "2017-04-17",
+  "valid_upto": "2017-04-17"
-  "min_qty": 2
  },
  {
   "doctype": "Item Price",
   "item_code": "_Test Item Home Desktop Manufactured",
   "price_list": "_Test Price List",
   "price_list_rate": 1000,
-  "min_qty" : 10,
   "valid_from": "2017-04-10",
-  "valid_upto": "2017-04-17",
+  "valid_upto": "2017-04-17"
-  "min_qty": 2
  }
 ]