From 4417529952976afc274f990f7107553742dc248d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 21 Aug 2014 16:24:49 +0530 Subject: [PATCH] Packing list visibility issue --- erpnext/public/js/feature_setup.js | 11 +- .../features_setup/features_setup.json | 339 +++++++++--------- 2 files changed, 171 insertions(+), 179 deletions(-) diff --git a/erpnext/public/js/feature_setup.js b/erpnext/public/js/feature_setup.js index a45b602da1..5abf2d9294 100644 --- a/erpnext/public/js/feature_setup.js +++ b/erpnext/public/js/feature_setup.js @@ -26,10 +26,6 @@ pscript.feature_dict = { 'Stock Entry': {'fields':['project_name']}, 'Timesheet': {'timesheet_details':['project_name']} }, - 'fs_packing_details': { - //'Delivery Note': {'fields':['packing_details','print_packing_slip','packing_checked_by','packed_by','pack_size','shipping_mark'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']}, - //'Sales Order': {'fields':['packing_details']} - }, 'fs_discounts': { 'Delivery Note': {'delivery_note_details':['discount_percentage']}, 'Quotation': {'quotation_details':['discount_percentage']}, @@ -152,10 +148,10 @@ pscript.feature_dict = { 'Address': {'fields':['sales_partner']}, 'Contact': {'fields':['sales_partner']}, 'Customer': {'fields':['sales_team']}, - 'Delivery Note': {'fields':['sales_team','packing_list']}, + 'Delivery Note': {'fields':['sales_team']}, 'Item': {'fields':['item_customer_details']}, - 'Sales Invoice': {'fields':['sales_team', 'packing_list']}, - 'Sales Order': {'fields':['sales_team','packing_list']} + 'Sales Invoice': {'fields':['sales_team']}, + 'Sales Order': {'fields':['sales_team']} }, 'fs_more_info': { "Customer Issue": {"fields": ["more_info"]}, @@ -190,7 +186,6 @@ $(document).bind('form_refresh', function() { for(var sys_feat in sys_defaults) { if(sys_defaults[sys_feat]=='0' && (sys_feat in pscript.feature_dict)) { //"Features to hide" exists - if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) { for(var fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) { if(fort=='fields') { diff --git a/erpnext/setup/doctype/features_setup/features_setup.json b/erpnext/setup/doctype/features_setup/features_setup.json index fee7c17826..3dd2b4e413 100644 --- a/erpnext/setup/doctype/features_setup/features_setup.json +++ b/erpnext/setup/doctype/features_setup/features_setup.json @@ -1,241 +1,238 @@ { - "creation": "2012-12-20 12:50:49.000000", - "docstatus": 0, - "doctype": "DocType", + "creation": "2012-12-20 12:50:49", + "docstatus": 0, + "doctype": "DocType", "fields": [ { - "fieldname": "materials", - "fieldtype": "Section Break", - "label": "Materials", + "fieldname": "materials", + "fieldtype": "Section Break", + "label": "Materials", "permlevel": 0 - }, + }, { - "description": "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.", - "fieldname": "fs_item_serial_nos", - "fieldtype": "Check", - "label": "Item Serial Nos", + "description": "To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.", + "fieldname": "fs_item_serial_nos", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Item Serial Nos", "permlevel": 0 - }, + }, { - "description": "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc", - "fieldname": "fs_item_batch_nos", - "fieldtype": "Check", - "label": "Item Batch Nos", + "description": "To track items in sales and purchase documents with batch nos
Preferred Industry: Chemicals etc", + "fieldname": "fs_item_batch_nos", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Item Batch Nos", "permlevel": 0 - }, + }, { - "description": "To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", - "fieldname": "fs_brands", - "fieldtype": "Check", - "label": "Brands", + "description": "To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", + "fieldname": "fs_brands", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Brands", "permlevel": 0 - }, + }, { - "description": "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", - "fieldname": "fs_item_barcode", - "fieldtype": "Check", - "label": "Item Barcode", + "description": "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", + "fieldname": "fs_item_barcode", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Item Barcode", "permlevel": 0 - }, + }, { - "fieldname": "column_break0", - "fieldtype": "Column Break", + "fieldname": "column_break0", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "description": "1. To maintain the customer wise item code and to make them searchable based on their code use this option", - "fieldname": "fs_item_advanced", - "fieldtype": "Check", - "label": "Item Advanced", + "description": "1. To maintain the customer wise item code and to make them searchable based on their code use this option", + "fieldname": "fs_item_advanced", + "fieldtype": "Check", + "label": "Item Advanced", "permlevel": 0 - }, + }, { - "description": "If Sale BOM is defined, the actual BOM of the Pack is displayed as table. Available in Delivery Note and Sales Order", - "fieldname": "fs_packing_details", - "fieldtype": "Check", - "label": "Packing Details", + "description": "To get Item Group in details table", + "fieldname": "fs_item_group_in_details", + "fieldtype": "Check", + "label": "Item Groups in Details", "permlevel": 0 - }, + }, { - "description": "To get Item Group in details table", - "fieldname": "fs_item_group_in_details", - "fieldtype": "Check", - "label": "Item Groups in Details", + "fieldname": "sales_and_purchase", + "fieldtype": "Section Break", + "label": "Sales and Purchase", "permlevel": 0 - }, + }, { - "fieldname": "sales_and_purchase", - "fieldtype": "Section Break", - "label": "Sales and Purchase", + "description": "All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.", + "fieldname": "fs_exports", + "fieldtype": "Check", + "label": "Exports", "permlevel": 0 - }, + }, { - "description": "All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.", - "fieldname": "fs_exports", - "fieldtype": "Check", - "label": "Exports", + "description": "All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.", + "fieldname": "fs_imports", + "fieldtype": "Check", + "label": "Imports", "permlevel": 0 - }, + }, { - "description": "All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.", - "fieldname": "fs_imports", - "fieldtype": "Check", - "label": "Imports", + "fieldname": "column_break1", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "column_break1", - "fieldtype": "Column Break", + "description": "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order", + "fieldname": "fs_discounts", + "fieldtype": "Check", + "label": "Sales Discounts", "permlevel": 0 - }, + }, { - "description": "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order", - "fieldname": "fs_discounts", - "fieldtype": "Check", - "label": "Sales Discounts", + "description": "Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice", + "fieldname": "fs_purchase_discounts", + "fieldtype": "Check", + "label": "Purchase Discounts", "permlevel": 0 - }, + }, { - "description": "Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice", - "fieldname": "fs_purchase_discounts", - "fieldtype": "Check", - "label": "Purchase Discounts", + "description": "To track any installation or commissioning related work after sales", + "fieldname": "fs_after_sales_installations", + "fieldtype": "Check", + "label": "After Sale Installations", "permlevel": 0 - }, + }, { - "description": "To track any installation or commissioning related work after sales", - "fieldname": "fs_after_sales_installations", - "fieldtype": "Check", - "label": "After Sale Installations", + "description": "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", + "fieldname": "fs_projects", + "fieldtype": "Check", + "label": "Projects", "permlevel": 0 - }, + }, { - "description": "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", - "fieldname": "fs_projects", - "fieldtype": "Check", - "label": "Projects", + "description": "If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity", + "fieldname": "fs_sales_extras", + "fieldtype": "Check", + "label": "Sales Extras", "permlevel": 0 - }, + }, { - "description": "If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity", - "fieldname": "fs_sales_extras", - "fieldtype": "Check", - "label": "Sales Extras", + "fieldname": "accounts", + "fieldtype": "Section Break", + "label": "Accounts", "permlevel": 0 - }, + }, { - "fieldname": "accounts", - "fieldtype": "Section Break", - "label": "Accounts", + "description": "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.", + "fieldname": "fs_recurring_invoice", + "fieldtype": "Check", + "label": "Recurring Invoice", "permlevel": 0 - }, + }, { - "description": "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.", - "fieldname": "fs_recurring_invoice", - "fieldtype": "Check", - "label": "Recurring Invoice", + "fieldname": "column_break2", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "column_break2", - "fieldtype": "Column Break", + "description": "To enable Point of Sale features", + "fieldname": "fs_pos", + "fieldtype": "Check", + "label": "Point of Sale", "permlevel": 0 - }, + }, { - "description": "To enable Point of Sale features", - "fieldname": "fs_pos", - "fieldtype": "Check", - "label": "Point of Sale", + "description": "To enable Point of Sale view", + "fieldname": "fs_pos_view", + "fieldtype": "Check", + "label": "POS View", "permlevel": 0 - }, + }, { - "description": "To enable Point of Sale view", - "fieldname": "fs_pos_view", - "fieldtype": "Check", - "label": "POS View", + "fieldname": "production", + "fieldtype": "Section Break", + "label": "Manufacturing", "permlevel": 0 - }, + }, { - "fieldname": "production", - "fieldtype": "Section Break", - "label": "Manufacturing", + "description": "If you involve in manufacturing activity. Enables Item 'Is Manufactured'", + "fieldname": "fs_manufacturing", + "fieldtype": "Check", + "label": "Manufacturing", "permlevel": 0 - }, + }, { - "description": "If you involve in manufacturing activity. Enables Item 'Is Manufactured'", - "fieldname": "fs_manufacturing", - "fieldtype": "Check", - "label": "Manufacturing", + "fieldname": "column_break3", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "column_break3", - "fieldtype": "Column Break", + "description": "If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt", + "fieldname": "fs_quality", + "fieldtype": "Check", + "label": "Quality", "permlevel": 0 - }, + }, { - "description": "If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt", - "fieldname": "fs_quality", - "fieldtype": "Check", - "label": "Quality", + "fieldname": "miscelleneous", + "fieldtype": "Section Break", + "label": "Miscelleneous", "permlevel": 0 - }, + }, { - "fieldname": "miscelleneous", - "fieldtype": "Section Break", - "label": "Miscelleneous", + "description": "If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page", + "fieldname": "fs_page_break", + "fieldtype": "Check", + "label": "Page Break", "permlevel": 0 - }, + }, { - "description": "If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page", - "fieldname": "fs_page_break", - "fieldtype": "Check", - "label": "Page Break", + "fieldname": "column_break4", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "column_break4", - "fieldtype": "Column Break", - "permlevel": 0 - }, - { - "fieldname": "fs_more_info", - "fieldtype": "Check", - "label": "More Info", + "fieldname": "fs_more_info", + "fieldtype": "Check", + "label": "More Info", "permlevel": 0 } - ], - "icon": "icon-glass", - "idx": 1, - "issingle": 1, - "modified": "2013-12-24 11:40:19.000000", - "modified_by": "Administrator", - "module": "Setup", - "name": "Features Setup", - "name_case": "Title Case", - "owner": "Administrator", + ], + "icon": "icon-glass", + "idx": 1, + "issingle": 1, + "modified": "2014-08-21 16:24:18.503070", + "modified_by": "Administrator", + "module": "Setup", + "name": "Features Setup", + "name_case": "Title Case", + "owner": "Administrator", "permissions": [ { - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "System Manager", - "submit": 0, + "create": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 0, + "role": "System Manager", + "submit": 0, "write": 1 - }, + }, { - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "Administrator", - "submit": 0, + "create": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 0, + "role": "Administrator", + "submit": 0, "write": 1 } ] -} +} \ No newline at end of file