diff --git a/product/ERP5/skins/erp5_trade/device_list.form b/product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form
similarity index 76%
rename from product/ERP5/skins/erp5_trade/device_list.form
rename to product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form
index 1fe47e70c1ceb46086456d4d794d87bb981589fa..27107c689e6312a3e8d1253794db666bc34ada01 100755
--- a/product/ERP5/skins/erp5_trade/device_list.form
+++ b/product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Device List</title>
-  <name>device_list</name>
+  <row_length>4</row_length>
+  <name>DeviceModule_viewDeviceList</name>
+  <pt>form_list</pt>
   <action></action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>UTF-8</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -15,33 +19,40 @@
 
       <field><id>listbox</id> <type>ListBox</type>
         <values>
-          <sort type="list">[('Id', 'Id')]</sort>
-          <domain_tree type="int">0</domain_tree>
-          <domain_root_list type="list">[]</domain_root_list>
-          <description></description>
-          <alternate_name></alternate_name>
-          <global_attributes type="list">[]</global_attributes>
-          <meta_types type="list">[]</meta_types>
-          <default_params type="list">[]</default_params>
-          <list_method type="method">portal_catalog</list_method>
+          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
-          <stat_method></stat_method>
-          <search type="int">0</search>
-          <editable_columns type="list">[]</editable_columns>
-          <title>listbox</title>
-          <default></default>
+          <alternate_name></alternate_name>
+          <columns type="list">[('getId', 'Id'), ('getTitle', 'Title'), ('getIpAddress', 'IP Address'), ('getOperatingSystem', 'Operating System'), ('getOwnerTitle', 'Owner')]</columns>
           <css_class></css_class>
-          <report_tree type="int">0</report_tree>
+          <default></default>
+          <default_params type="list">[]</default_params>
+          <description></description>
+          <domain_root_list type="list">[]</domain_root_list>
+          <domain_tree type="int">0</domain_tree>
+          <editable type="int">1</editable>
+          <editable_columns type="list">[]</editable_columns>
+          <enabled type="int">1</enabled>
+          <external_validator></external_validator>
+          <global_attributes type="list">[]</global_attributes>
+          <hidden type="int">0</hidden>
           <lines type="int">10</lines>
           <list_action>list</list_action>
-          <external_validator></external_validator>
+          <list_method type="method">portal_catalog</list_method>
+          <meta_types type="list">[]</meta_types>
+          <portal_types type="list">[('Device', 'Device')]</portal_types>
           <report_root_list type="list">[]</report_root_list>
+          <report_tree type="int">0</report_tree>
+          <search></search>
+          <search_columns></search_columns>
           <select type="int">0</select>
           <selection_name></selection_name>
-          <hidden type="int">0</hidden>
-          <portal_types type="list">[('Device', 'Device')]</portal_types>
-          <columns type="list">[('getId', 'Id'), ('getTitle', 'Title'), ('getIpAddress', 'IP Address'), ('getOperatingSystem', 'Operating System'), ('getOwnerTitle', 'Owner')]</columns>
+          <sort type="list">[('Id', 'Id')]</sort>
+          <sort_columns></sort_columns>
+          <stat_columns></stat_columns>
+          <stat_method></stat_method>
+          <title>listbox</title>
+          <url_columns></url_columns>
         </values>
         <tales>
         </tales>
@@ -52,4 +63,4 @@
       </fields>
     </group>
   </groups>
-</form>
+</form>
\ No newline at end of file