fix [ux]: Purchase Order Form Cleanup (#20932)
* chore: Purchase Order Form Cleanup
* fix: Get Items from popups cleanup
* fix: Shift Set Target Warehouse next to Supply Raw Materials.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 1741869..0e748f8 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"autoname": "hash",
"creation": "2013-05-21 16:16:04",
"doctype": "DocType",
@@ -14,11 +15,11 @@
"col_break1",
"account_head",
"description",
+ "section_break_10",
+ "rate",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
- "section_break_10",
- "rate",
"section_break_9",
"tax_amount",
"tax_amount_after_discount_amount",
@@ -27,8 +28,7 @@
"base_tax_amount",
"base_total",
"base_tax_amount_after_discount_amount",
- "item_wise_tax_detail",
- "parenttype"
+ "item_wise_tax_detail"
],
"fields": [
{
@@ -53,6 +53,7 @@
},
{
"columns": 2,
+ "default": "On Net Total",
"fieldname": "charge_type",
"fieldtype": "Select",
"in_list_view": 1,
@@ -197,15 +198,6 @@
"read_only": 1
},
{
- "fieldname": "parenttype",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Parenttype",
- "oldfieldname": "parenttype",
- "oldfieldtype": "Data",
- "print_hide": 1
- },
- {
"fieldname": "accounting_dimensions_section",
"fieldtype": "Section Break",
"label": "Accounting Dimensions"
@@ -217,11 +209,14 @@
],
"idx": 1,
"istable": 1,
- "modified": "2019-05-25 23:08:38.281025",
+ "links": [],
+ "modified": "2020-03-12 14:53:47.679439",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges",
"owner": "Administrator",
"permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 3111a3a..ed054ae 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -365,9 +365,7 @@
method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
source_doctype: "Material Request",
target: me.frm,
- setters: {
- company: me.frm.doc.company
- },
+ setters: {},
get_query_filters: {
material_request_type: "Purchase",
docstatus: 1,
@@ -384,7 +382,7 @@
source_doctype: "Supplier Quotation",
target: me.frm,
setters: {
- company: me.frm.doc.company
+ supplier: me.frm.doc.supplier
},
get_query_filters: {
docstatus: 1,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 578858c..a4f60fb 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -54,11 +54,6 @@
"items_section",
"scan_barcode",
"items",
- "section_break_48",
- "pricing_rules",
- "raw_material_details",
- "set_reserve_warehouse",
- "supplied_items",
"sb_last_purchase",
"total_qty",
"base_total",
@@ -67,6 +62,11 @@
"total_net_weight",
"total",
"net_total",
+ "section_break_48",
+ "pricing_rules",
+ "raw_material_details",
+ "set_reserve_warehouse",
+ "supplied_items",
"taxes_section",
"tax_category",
"column_break_50",
@@ -105,23 +105,25 @@
"payment_schedule_section",
"payment_terms_template",
"payment_schedule",
+ "tracking_section",
+ "per_billed",
+ "column_break_75",
+ "per_received",
"terms_section_break",
"tc_name",
"terms",
"more_info",
"status",
"ref_sq",
+ "column_break_74",
"party_account_currency",
"inter_company_order_reference",
- "column_break_74",
- "per_received",
- "per_billed",
"column_break5",
"letter_head",
"select_print_heading",
"column_break_86",
- "group_same_items",
"language",
+ "group_same_items",
"subscription_section",
"from_date",
"to_date",
@@ -220,7 +222,7 @@
"allow_on_submit": 1,
"fieldname": "schedule_date",
"fieldtype": "Date",
- "label": "Reqd By Date"
+ "label": "Required By"
},
{
"allow_on_submit": 1,
@@ -432,6 +434,7 @@
"fieldtype": "Section Break"
},
{
+ "description": "Sets 'Warehouse' in each row of the Items table.",
"fieldname": "set_warehouse",
"fieldtype": "Link",
"label": "Set Target Warehouse",
@@ -827,6 +830,7 @@
"read_only": 1
},
{
+ "collapsible": 1,
"fieldname": "payment_schedule_section",
"fieldtype": "Section Break",
"label": "Payment Terms"
@@ -917,7 +921,8 @@
"fieldname": "inter_company_order_reference",
"fieldtype": "Link",
"label": "Inter Company Order Reference",
- "options": "Sales Order"
+ "options": "Sales Order",
+ "read_only": 1
},
{
"fieldname": "column_break_74",
@@ -930,8 +935,6 @@
"in_list_view": 1,
"label": "% Received",
"no_copy": 1,
- "oldfieldname": "per_received",
- "oldfieldtype": "Currency",
"print_hide": 1,
"read_only": 1
},
@@ -942,8 +945,6 @@
"in_list_view": 1,
"label": "% Billed",
"no_copy": 1,
- "oldfieldname": "per_billed",
- "oldfieldtype": "Currency",
"print_hide": 1,
"read_only": 1
},
@@ -998,6 +999,7 @@
"print_hide": 1
},
{
+ "collapsible": 1,
"fieldname": "subscription_section",
"fieldtype": "Section Break",
"label": "Subscription Section"
@@ -1050,13 +1052,23 @@
"fieldtype": "Link",
"label": "Set Reserve Warehouse",
"options": "Warehouse"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "tracking_section",
+ "fieldtype": "Section Break",
+ "label": "Tracking"
+ },
+ {
+ "fieldname": "column_break_75",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2020-04-17 13:04:28.185197",
+ "modified": "2020-04-24 12:13:14.186280",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
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 e37e1dd..7a52c28 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -18,10 +18,6 @@
"col_break1",
"image",
"image_view",
- "manufacture_details",
- "manufacturer",
- "column_break_14",
- "manufacturer_part_no",
"quantity_and_rate",
"qty",
"stock_uom",
@@ -44,7 +40,6 @@
"base_amount",
"pricing_rules",
"is_free_item",
- "is_fixed_asset",
"section_break_29",
"net_rate",
"net_amount",
@@ -52,11 +47,6 @@
"base_net_rate",
"base_net_amount",
"billed_amt",
- "item_weight_details",
- "weight_per_unit",
- "total_weight",
- "column_break_40",
- "weight_uom",
"warehouse_and_reference",
"warehouse",
"delivered_by_supplier",
@@ -80,20 +70,31 @@
"column_break_60",
"received_qty",
"returned_qty",
+ "manufacture_details",
+ "manufacturer",
+ "column_break_14",
+ "manufacturer_part_no",
+ "more_info_section_break",
+ "is_fixed_asset",
+ "item_tax_rate",
"accounting_details",
"expense_account",
"column_break_68",
+ "item_weight_details",
+ "weight_per_unit",
+ "total_weight",
+ "column_break_40",
+ "weight_uom",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
"section_break_72",
- "page_break",
- "item_tax_rate"
+ "page_break"
],
"fields": [
{
"bold": 1,
- "columns": 3,
+ "columns": 2,
"fieldname": "item_code",
"fieldtype": "Link",
"in_list_view": 1,
@@ -133,7 +134,7 @@
"fieldname": "schedule_date",
"fieldtype": "Date",
"in_list_view": 1,
- "label": "Reqd By Date",
+ "label": "Required By",
"oldfieldname": "schedule_date",
"oldfieldtype": "Date",
"print_hide": 1,
@@ -216,15 +217,16 @@
"print_hide": 1
},
{
+ "columns": 1,
"fieldname": "uom",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
"options": "UOM",
"print_width": "100px",
- "reqd": 1,
- "width": "100px"
+ "reqd": 1
},
{
"fieldname": "conversion_factor",
@@ -685,6 +687,7 @@
"fieldtype": "Column Break"
},
{
+ "collapsible": 1,
"fieldname": "manufacture_details",
"fieldtype": "Section Break",
"label": "Manufacture"
@@ -717,12 +720,17 @@
"fieldtype": "Check",
"label": "Is Fixed Asset",
"read_only": 1
+ },
+ {
+ "fieldname": "more_info_section_break",
+ "fieldtype": "Section Break",
+ "label": "More Information"
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-04-07 18:35:17.558928",
+ "modified": "2020-04-21 11:55:58.643393",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
diff --git a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
index 8435bbb..c3e1bf5 100644
--- a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
@@ -1,20 +1,26 @@
{
+ "actions": [],
"creation": "2013-02-22 01:27:42",
"doctype": "DocType",
"editable_grid": 1,
+ "engine": "InnoDB",
"field_order": [
"main_item_code",
- "rm_item_code",
- "required_qty",
- "supplied_qty",
- "rate",
- "amount",
- "column_break_6",
"bom_detail_no",
- "reference_name",
- "conversion_factor",
"stock_uom",
- "reserve_warehouse"
+ "conversion_factor",
+ "column_break_6",
+ "rm_item_code",
+ "reference_name",
+ "reserve_warehouse",
+ "section_break2",
+ "rate",
+ "col_break2",
+ "amount",
+ "section_break1",
+ "required_qty",
+ "col_break1",
+ "supplied_qty"
],
"fields": [
{
@@ -120,15 +126,34 @@
"in_list_view": 1,
"label": "Supplied Qty",
"read_only": 1
+ },
+ {
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break2",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break"
}
],
"hide_toolbar": 1,
"idx": 1,
"istable": 1,
- "modified": "2019-08-20 13:37:32.702068",
+ "links": [],
+ "modified": "2020-03-12 15:43:53.862897",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item Supplied",
"owner": "dhanalekshmi@webnotestech.com",
- "permissions": []
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC"
}
\ No newline at end of file