Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Purchase Receipt Form Cleanup (#21232)

Browse Source
This commit is contained in:
Marica 2020-04-21 13:15:05 +05:30 committed by GitHub
parent 9942acd9d4
commit bda0ddf1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
View File

@ -1,24 +1,31 @@
{
"actions": [],
"creation": "2013-02-22 01:27:42",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"main_item_code",
"rm_item_code",
"description",
"batch_no",
"serial_no",
"bom_detail_no",
"col_break1",
"required_qty",
"consumed_qty",
"rm_item_code",
"stock_uom",
"rate",
"amount",
"conversion_factor",
"current_stock",
"reference_name",
"bom_detail_no"
"secbreak_1",
"rate",
"col_break2",
"amount",
"secbreak_2",
"required_qty",
"col_break3",
"consumed_qty",
"current_stock",
"secbreak_3",
"batch_no",
"col_break4",
"serial_no"
],
"fields": [
{
@ -152,11 +159,36 @@
"oldfieldname": "bom_detail_no",
"oldfieldtype": "Data",
"read_only": 1
},
{
"fieldname": "secbreak_1",
"fieldtype": "Section Break"
},
{
"fieldname": "col_break2",
"fieldtype": "Column Break"
},
{
"fieldname": "secbreak_2",
"fieldtype": "Section Break"
},
{
"fieldname": "col_break3",
"fieldtype": "Column Break"
},
{
"fieldname": "secbreak_3",
"fieldtype": "Section Break"
},
{
"fieldname": "col_break4",
"fieldtype": "Column Break"
}
],
"idx": 1,
"istable": 1,
"modified": "2019-11-21 16:25:29.909112",
"links": [],
"modified": "2020-04-10 18:09:33.997618",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Receipt Item Supplied",

36
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -16,10 +16,10 @@
"supplier_name",
"supplier_delivery_note",
"column_break1",
"company",
"posting_date",
"posting_time",
"set_posting_time",
"company",
"is_return",
"return_against",
"section_addresses",
@ -49,11 +49,6 @@
"items_section",
"scan_barcode",
"items",
"pricing_rule_details",
"pricing_rules",
"get_current_stock",
"raw_material_details",
"supplied_items",
"section_break0",
"total_qty",
"base_total",
@ -62,6 +57,12 @@
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"pricing_rule_details",
"pricing_rules",
"raw_material_details",
"get_current_stock",
"supplied_items",
"taxes_charges_section",
"tax_category",
"shipping_col",
@ -113,13 +114,13 @@
"auto_repeat",
"printing_settings",
"letter_head",
"select_print_heading",
"language",
"group_same_items",
"column_break_97",
"other_details",
"instructions",
"column_break_97",
"select_print_heading",
"other_details",
"remarks",
"group_same_items",
"transporter_info",
"transporter_name",
"column_break5",
@ -404,6 +405,7 @@
"fieldtype": "Section Break"
},
{
"description": "Sets 'Accepted Warehouse' in each row of the items table.",
"fieldname": "set_warehouse",
"fieldtype": "Link",
"label": "Accepted Warehouse",
@ -411,7 +413,7 @@
"print_hide": 1
},
{
"description": "Warehouse where you are maintaining stock of rejected items",
"description": "Sets 'Rejected Warehouse' in each row of the items table.",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
"label": "Rejected Warehouse",
@ -429,7 +431,7 @@
"default": "No",
"fieldname": "is_subcontracted",
"fieldtype": "Select",
"label": "Raw Materials Supplied",
"label": "Raw Materials Consumed",
"oldfieldname": "is_subcontracted",
"oldfieldtype": "Select",
"options": "No\nYes",
@ -465,6 +467,7 @@
"reqd": 1
},
{
"collapsible": 1,
"fieldname": "pricing_rule_details",
"fieldtype": "Section Break",
"label": "Pricing Rules"
@ -477,9 +480,10 @@
"read_only": 1
},
{
"depends_on": "supplied_items",
"fieldname": "get_current_stock",
"fieldtype": "Button",
"label": "Get current stock",
"label": "Get Current Stock",
"oldfieldtype": "Button",
"options": "get_current_stock",
"print_hide": 1
@ -489,7 +493,7 @@
"collapsible_depends_on": "supplied_items",
"fieldname": "raw_material_details",
"fieldtype": "Section Break",
"label": "Raw Materials Supplied",
"label": "Raw Materials Consumed",
"oldfieldtype": "Section Break",
"options": "fa fa-table",
"print_hide": 1,
@ -498,7 +502,7 @@
{
"fieldname": "supplied_items",
"fieldtype": "Table",
"label": "Supplied Items",
"label": "Consumed Items",
"no_copy": 1,
"oldfieldname": "pr_raw_material_details",
"oldfieldtype": "Table",
@ -1082,7 +1086,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
"modified": "2020-04-17 13:06:26.970288",
"modified": "2020-04-18 18:02:18.020763",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",

60
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -15,15 +15,11 @@
"item_name",
"section_break_4",
"description",
"item_group",
"brand",
"image_section",
"image_column",
"item_group",
"image",
"image_view",
"manufacture_details",
"manufacturer",
"column_break_16",
"manufacturer_part_no",
"received_and_accepted",
"received_qty",
"qty",
@ -32,6 +28,7 @@
"uom",
"stock_uom",
"conversion_factor",
"stock_qty",
"retain_sample",
"sample_quantity",
"rate_and_amount",
@ -60,11 +57,6 @@
"rm_supp_cost",
"landed_cost_voucher_amount",
"billed_amt",
"item_weight_details",
"weight_per_unit",
"total_weight",
"column_break_41",
"weight_uom",
"warehouse_and_reference",
"warehouse",
"rejected_warehouse",
@ -77,20 +69,27 @@
"asset_category",
"schedule_date",
"quality_inspection",
"stock_qty",
"purchase_order_item",
"material_request_item",
"section_break_45",
"allow_zero_valuation_rate",
"bom",
"col_break5",
"serial_no",
"col_break5",
"include_exploded_items",
"batch_no",
"column_break_48",
"rejected_serial_no",
"expense_account",
"include_exploded_items",
"item_tax_rate",
"item_weight_details",
"weight_per_unit",
"total_weight",
"column_break_41",
"weight_uom",
"manufacture_details",
"manufacturer",
"column_break_16",
"manufacturer_part_no",
"accounting_dimensions_section",
"project",
"dimension_col_break",
@ -526,7 +525,7 @@
{
"fieldname": "stock_qty",
"fieldtype": "Float",
"label": "Qty as per Stock UOM",
"label": "Accepted Qty as per Stock UOM",
"oldfieldname": "stock_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
@ -553,17 +552,13 @@
"fieldname": "batch_no",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Batch No!",
"label": "Batch No",
"no_copy": 1,
"oldfieldname": "batch_no",
"oldfieldtype": "Link",
"options": "Batch",
"print_hide": 1
},
{
"fieldname": "column_break_48",
"fieldtype": "Column Break"
},
{
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "rejected_serial_no",
@ -658,6 +653,7 @@
"read_only": 1
},
{
"fetch_from": "item_code.brand",
"fieldname": "brand",
"fieldtype": "Link",
"hidden": 1,
@ -669,9 +665,9 @@
"read_only": 1
},
{
"fetch_from": "item_code.item_group",
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
"label": "Item Group",
"oldfieldname": "item_group",
"oldfieldtype": "Link",
@ -748,22 +744,19 @@
"fieldname": "section_break_80",
"fieldtype": "Section Break"
},
{
"collapsible": 1,
"fieldname": "image_section",
"fieldtype": "Section Break",
"label": "Image"
},
{
"fieldname": "material_request",
"fieldtype": "Link",
"label": "Material Request",
"options": "Material Request"
"options": "Material Request",
"read_only": 1
},
{
"fieldname": "material_request_item",
"fieldtype": "Data",
"label": "Material Request Item"
"hidden": 1,
"label": "Material Request Item",
"read_only": 1
},
{
"fieldname": "expense_account",
@ -826,12 +819,17 @@
"ignore_user_permissions": 1,
"label": "Supplier Warehouse",
"options": "Warehouse"
},
{
"collapsible": 1,
"fieldname": "image_column",
"fieldtype": "Column Break"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-04-07 18:38:21.141558",
"modified": "2020-04-10 19:01:21.154963",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",