From f21ceb283c94dc2dcca9942f48f893ab6ca9fc7d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 14 Dec 2011 11:26:05 +0530 Subject: [PATCH] Arranged field order in item table --- .../accounts/doctype/pv_detail/pv_detail.txt | 164 ++++++++------ .../buying/doctype/po_detail/po_detail.txt | 147 ++++++------ .../purchase_receipt_detail.txt | 213 ++++++++++-------- 3 files changed, 289 insertions(+), 235 deletions(-) diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index f14b44b01e..e1181b0bb3 100755 --- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt +++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:17', 'docstatus': 0, - 'modified': '2011-12-13 12:06:35', + 'modified': '2011-12-14 10:44:21', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,6 +14,7 @@ { 'autoname': 'EVD.######', 'colour': 'White:FFF', + 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Accounts', @@ -21,7 +22,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 39 + 'version': 42 }, # These values are common for all DocField @@ -70,18 +71,6 @@ 'search_index': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'brand', - 'fieldtype': 'Data', - 'label': 'Brand', - 'oldfieldname': 'brand', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 1 - }, - # DocField { 'doctype': 'DocField', @@ -94,21 +83,6 @@ 'width': '300px' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'item_group', - 'fieldtype': 'Link', - 'in_filter': 1, - 'label': 'Item Group', - 'oldfieldname': 'item_group', - 'oldfieldtype': 'Link', - 'options': 'Item Group', - 'permlevel': 1, - 'print_hide': 1, - 'search_index': 1 - }, - # DocField { 'doctype': 'DocField', @@ -123,6 +97,52 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0, + 'trigger': 'Client' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount %', + 'permlevel': 0, + 'trigger': 'Client' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_rate', + 'fieldtype': 'Currency', + 'label': 'Rate ', + 'oldfieldname': 'import_rate', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 1, + 'trigger': 'Client' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_amount', + 'fieldtype': 'Currency', + 'label': 'Amount', + 'oldfieldname': 'import_amount', + 'oldfieldtype': 'Currency', + 'permlevel': 1, + 'reqd': 1 + }, + # DocField { 'doctype': 'DocField', @@ -160,52 +180,6 @@ 'reqd': 1 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount %', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_rate', - 'fieldtype': 'Currency', - 'label': 'Rate ', - 'oldfieldname': 'import_rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'reqd': 1 - }, - # DocField { 'colour': 'White:FFF', @@ -239,6 +213,46 @@ 'width': '120px' }, + # DocField + { + 'colour': 'White:FFF', + 'doctype': 'DocField', + 'fieldname': 'project_name', + 'fieldtype': 'Link', + 'in_filter': 1, + 'label': 'Project Name', + 'options': 'Project', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'brand', + 'fieldtype': 'Data', + 'label': 'Brand', + 'oldfieldname': 'brand', + 'oldfieldtype': 'Data', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'item_group', + 'fieldtype': 'Link', + 'in_filter': 1, + 'label': 'Item Group', + 'oldfieldname': 'item_group', + 'oldfieldtype': 'Link', + 'options': 'Item Group', + 'permlevel': 1, + 'print_hide': 1, + 'search_index': 1 + }, + # DocField { 'doctype': 'DocField', diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt index c8d831b8dc..1512666b03 100755 --- a/erpnext/buying/doctype/po_detail/po_detail.txt +++ b/erpnext/buying/doctype/po_detail/po_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:12', 'docstatus': 0, - 'modified': '2011-12-13 13:02:05', + 'modified': '2011-12-14 10:49:46', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,6 +14,7 @@ { 'autoname': 'POD/.#####', 'colour': 'White:FFF', + 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Buying', @@ -21,7 +22,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 59 + 'version': 60 }, # These values are common for all DocField @@ -104,6 +105,7 @@ # DocField { + 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'qty', 'fieldtype': 'Currency', @@ -119,40 +121,12 @@ # DocField { 'doctype': 'DocField', - 'fieldname': 'purchase_rate', + 'fieldname': 'import_ref_rate', 'fieldtype': 'Currency', - 'label': 'Rate (Default Curr.) *', - 'oldfieldname': 'purchase_rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'trigger': 'Client', - 'width': '100px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'purchase_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate *', + 'label': 'Ref Rate ', 'permlevel': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'label': 'Amount (Default Curr.)', - 'oldfieldname': 'amount', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1, - 'reqd': 1 - }, - # DocField { 'doctype': 'DocField', @@ -177,15 +151,6 @@ 'trigger': 'Client' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', @@ -200,19 +165,42 @@ # DocField { 'doctype': 'DocField', - 'fieldname': 'uom', - 'fieldtype': 'Link', - 'label': 'UOM', - 'oldfieldname': 'uom', - 'oldfieldtype': 'Link', - 'options': 'UOM', + 'fieldname': 'purchase_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate *', + 'permlevel': 0 + }, + + # DocField + { + 'default': '0.00', + 'doctype': 'DocField', + 'fieldname': 'purchase_rate', + 'fieldtype': 'Currency', + 'label': 'Rate (Default Curr.) *', + 'oldfieldname': 'purchase_rate', + 'oldfieldtype': 'Currency', 'permlevel': 0, - 'print_hide': 0, + 'print_hide': 1, 'reqd': 1, 'trigger': 'Client', 'width': '100px' }, + # DocField + { + 'default': '0.00', + 'doctype': 'DocField', + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'label': 'Amount (Default Curr.)', + 'oldfieldname': 'amount', + 'oldfieldtype': 'Currency', + 'permlevel': 1, + 'print_hide': 1, + 'reqd': 1 + }, + # DocField { 'doctype': 'DocField', @@ -229,6 +217,35 @@ 'trigger': 'Client' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'project_name', + 'fieldtype': 'Link', + 'in_filter': 1, + 'label': 'Project Name', + 'options': 'Project', + 'permlevel': 0, + 'print_hide': 1, + 'report_hide': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'uom', + 'fieldtype': 'Link', + 'label': 'UOM', + 'oldfieldname': 'uom', + 'oldfieldtype': 'Link', + 'options': 'UOM', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 1, + 'trigger': 'Client', + 'width': '100px' + }, + # DocField { 'colour': 'White:FFF', @@ -246,21 +263,6 @@ 'width': '100px' }, - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'prevdoc_doctype', - 'fieldtype': 'Data', - 'hidden': 1, - 'label': 'Prevdoc DocType', - 'no_copy': 0, - 'oldfieldname': 'prevdoc_doctype', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'print_hide': 1 - }, - # DocField { 'doctype': 'DocField', @@ -276,6 +278,21 @@ 'width': '100px' }, + # DocField + { + 'colour': 'White:FFF', + 'doctype': 'DocField', + 'fieldname': 'prevdoc_doctype', + 'fieldtype': 'Data', + 'hidden': 1, + 'label': 'Prevdoc DocType', + 'no_copy': 0, + 'oldfieldname': 'prevdoc_doctype', + 'oldfieldtype': 'Data', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'colour': 'White:FFF', @@ -359,6 +376,7 @@ # DocField { + 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'stock_qty', 'fieldtype': 'Currency', @@ -367,7 +385,7 @@ 'no_copy': 1, 'oldfieldname': 'stock_qty', 'oldfieldtype': 'Currency', - 'permlevel': 0, + 'permlevel': 1, 'print_hide': 1, 'trigger': 'Client', 'width': '100px' @@ -389,6 +407,7 @@ # DocField { + 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'billed_qty', 'fieldtype': 'Currency', diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index afe8d997c8..9aacefdb24 100755 --- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt +++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:16', 'docstatus': 0, - 'modified': '2011-12-13 13:03:11', + 'modified': '2011-12-14 10:50:00', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -14,6 +14,7 @@ { 'autoname': 'GRND/.#######', 'colour': 'White:FFF', + 'default_print_format': 'Standard', 'doctype': 'DocType', 'istable': 1, 'module': 'Stock', @@ -21,7 +22,7 @@ 'section_style': 'Tray', 'server_code_error': ' ', 'show_in_menu': 0, - 'version': 71 + 'version': 73 }, # These values are common for all DocField @@ -99,6 +100,20 @@ 'width': '100px' }, + # DocField + { + 'default': '0.00', + 'doctype': 'DocField', + 'fieldname': 'qty', + 'fieldtype': 'Currency', + 'label': 'Accepted Quantity', + 'oldfieldname': 'qty', + 'oldfieldtype': 'Currency', + 'permlevel': 0, + 'trigger': 'Client', + 'width': '100px' + }, + # DocField { 'default': '0.00', @@ -117,18 +132,49 @@ # DocField { + 'doctype': 'DocField', + 'fieldname': 'import_ref_rate', + 'fieldtype': 'Currency', + 'label': 'Ref Rate ', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'discount_rate', + 'fieldtype': 'Currency', + 'label': 'Discount %', + 'permlevel': 0 + }, + + # DocField + { + 'colour': 'White:FFF', 'default': '0.00', 'doctype': 'DocField', - 'fieldname': 'qty', + 'fieldname': 'import_rate', 'fieldtype': 'Currency', - 'label': 'Accepted Quantity', - 'oldfieldname': 'qty', + 'label': 'Rate', + 'oldfieldname': 'import_rate', 'oldfieldtype': 'Currency', 'permlevel': 0, + 'print_hide': 0, 'trigger': 'Client', 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'import_amount', + 'fieldtype': 'Currency', + 'label': 'Amount', + 'oldfieldname': 'import_amount', + 'oldfieldtype': 'Currency', + 'permlevel': 1 + }, + # DocField { 'doctype': 'DocField', @@ -141,6 +187,7 @@ # DocField { 'colour': 'White:FFF', + 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'purchase_rate', 'fieldtype': 'Currency', @@ -156,6 +203,7 @@ # DocField { + 'default': '0.00', 'doctype': 'DocField', 'fieldname': 'amount', 'fieldtype': 'Currency', @@ -169,6 +217,21 @@ 'width': '100px' }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'warehouse', + 'fieldtype': 'Link', + 'hidden': 0, + 'label': 'Accepted Warehouse', + 'oldfieldname': 'warehouse', + 'oldfieldtype': 'Link', + 'options': 'Warehouse', + 'permlevel': 0, + 'print_hide': 0, + 'width': '100px' + }, + # DocField { 'colour': 'White:FFF', @@ -185,50 +248,6 @@ 'width': '100px' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'discount_rate', - 'fieldtype': 'Currency', - 'label': 'Discount %', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'import_rate', - 'fieldtype': 'Currency', - 'label': 'Rate', - 'oldfieldname': 'import_rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 0, - 'trigger': 'Client', - 'width': '100px' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_ref_rate', - 'fieldtype': 'Currency', - 'label': 'Ref Rate ', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'import_amount', - 'fieldtype': 'Currency', - 'label': 'Amount', - 'oldfieldname': 'import_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - # DocField { 'doctype': 'DocField', @@ -244,21 +263,6 @@ 'width': '100px' }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'warehouse', - 'fieldtype': 'Link', - 'hidden': 0, - 'label': 'Accepted Warehouse', - 'oldfieldname': 'warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', - 'permlevel': 0, - 'print_hide': 0, - 'width': '100px' - }, - # DocField { 'doctype': 'DocField', @@ -290,6 +294,50 @@ 'width': '100px' }, + # DocField + { + 'colour': 'White:FFF', + 'doctype': 'DocField', + 'fieldname': 'schedule_date', + 'fieldtype': 'Date', + 'label': 'Schedule date', + 'no_copy': 1, + 'oldfieldname': 'schedule_date', + 'oldfieldtype': 'Date', + 'permlevel': 0, + 'print_hide': 1, + 'report_hide': 0, + 'reqd': 1 + }, + + # DocField + { + 'colour': 'White:FFF', + 'doctype': 'DocField', + 'fieldname': 'project_name', + 'fieldtype': 'Link', + 'in_filter': 1, + 'label': 'Project Name', + 'options': 'Project', + 'permlevel': 0, + 'print_hide': 1 + }, + + # DocField + { + 'colour': 'White:FFF', + 'doctype': 'DocField', + 'fieldname': 'qa_no', + 'fieldtype': 'Link', + 'label': 'QA No', + 'no_copy': 1, + 'oldfieldname': 'qa_no', + 'oldfieldtype': 'Link', + 'options': 'QA Inspection Report', + 'permlevel': 0, + 'print_hide': 1 + }, + # DocField { 'doctype': 'DocField', @@ -320,28 +368,13 @@ 'search_index': 1 }, - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'schedule_date', - 'fieldtype': 'Date', - 'label': 'Schedule date', - 'no_copy': 1, - 'oldfieldname': 'schedule_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 0, - 'reqd': 1 - }, - # DocField { 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'serial_no', 'fieldtype': 'Text', + 'in_filter': 1, 'label': 'Serial No', 'no_copy': 1, 'oldfieldname': 'serial_no', @@ -366,21 +399,6 @@ 'trigger': 'Client' }, - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'qa_no', - 'fieldtype': 'Link', - 'label': 'QA No', - 'no_copy': 1, - 'oldfieldname': 'qa_no', - 'oldfieldtype': 'Link', - 'options': 'QA Inspection Report', - 'permlevel': 0, - 'print_hide': 1 - }, - # DocField { 'doctype': 'DocField', @@ -460,6 +478,7 @@ # DocField { + 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'item_tax_amount', 'fieldtype': 'Currency', @@ -510,6 +529,7 @@ # DocField { + 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldname': 'valuation_rate', 'fieldtype': 'Currency', @@ -519,13 +539,14 @@ 'no_copy': 1, 'oldfieldname': 'valuation_rate', 'oldfieldtype': 'Currency', - 'permlevel': 0, + 'permlevel': 1, 'print_hide': 1, 'width': '80px' }, # DocField { + 'colour': 'White:FFF', 'description': 'Tax detail table fetched from item master as a string and stored in this field.\nUsed for Purchase Other Charges', 'doctype': 'DocField', 'fieldname': 'item_tax_rate',