- add trade_matrix_workflow, in this way it's not needed to call updateCellRange in unit tests

- proxify matrix_box field in PaySheetLine_viewCells and PaySheetModelLine_view
- change a portal_type icon (because it don't exist) to use a existing icon.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27028 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml

@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>content_icon</string> </key>
-            <value> <string>order_line_icon.gif</string> </value>
+            <value> <string>file_icon.gif</string> </value>
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>

bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -5,27 +5,27 @@
  </chain>
  <chain>
   <type>Pay Sheet Cell</type>
-  <workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow</workflow>
+  <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Pay Sheet Line</type>
-  <workflow>delivery_movement_simulation_interaction_workflow, edit_workflow, delivery_movement_causality_interaction_workflow</workflow>
+  <workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Pay Sheet Model</type>
-  <workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow>
+  <workflow>paysheet_model_interaction_workflow, validation_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Pay Sheet Model Line</type>
-  <workflow>edit_workflow</workflow>
+  <workflow>trade_matrix_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Pay Sheet Transaction</type>
-  <workflow>edit_workflow, delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, accounting_workflow, delivery_causality_workflow</workflow>
+  <workflow>delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, delivery_causality_workflow, edit_workflow, accounting_workflow</workflow>
  </chain>
  <chain>
   <type>Pay Sheet Transaction Line</type>
-  <workflow>delivery_movement_causality_interaction_workflow, edit_workflow, delivery_movement_simulation_interaction_workflow</workflow>
+  <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Payroll Service</type>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml

@@ -13,14 +13,13 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>editable_attributes</string>
                 <string>title</string>
-                <string>tabs</string>
-                <string>lines</string>
                 <string>cell_base_id</string>
                 <string>cell_portal_type</string>
-                <string>update_cell_range</string>
+                <string>lines</string>
                 <string>columns</string>
+                <string>tabs</string>
+                <string>editable_attributes</string>
               </list>
             </value>
         </item>
@@ -175,10 +174,6 @@
                     <key> <string>title</string> </key>
                     <value> <string>Cells</string> </value>
                 </item>
-                <item>
-                    <key> <string>update_cell_range</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
               </dictionary>
             </value>
         </item>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml

@@ -13,15 +13,14 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>cell_portal_type</string>
-                <string>editable_attributes</string>
                 <string>title</string>
-                <string>global_attributes</string>
                 <string>cell_base_id</string>
-                <string>update_cell_range</string>
-                <string>tabs</string>
+                <string>cell_portal_type</string>
                 <string>lines</string>
                 <string>columns</string>
+                <string>tabs</string>
+                <string>editable_attributes</string>
+                <string>global_attributes</string>
               </list>
             </value>
         </item>
@@ -108,6 +107,12 @@
                     <key> <string>cell_portal_type</string> </key>
                     <value> <string>Pay Sheet Cell</string> </value>
                 </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>editable_attributes</string> </key>
                     <value>
@@ -150,6 +155,18 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>tabs</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
@@ -158,10 +175,6 @@
                     <key> <string>title</string> </key>
                     <value> <string>matrixbox</string> </value>
                 </item>
-                <item>
-                    <key> <string>update_cell_range</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
               </dictionary>
             </value>
         </item>

bt5/erp5_payroll/bt/revision

-404
+408
\ No newline at end of file

bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list

@@ -5,7 +5,9 @@ Pay Sheet Cell | edit_workflow
 Pay Sheet Line | delivery_movement_causality_interaction_workflow
 Pay Sheet Line | delivery_movement_simulation_interaction_workflow
 Pay Sheet Line | edit_workflow
+Pay Sheet Line | trade_matrix_workflow
 Pay Sheet Model Line | edit_workflow
+Pay Sheet Model Line | trade_matrix_workflow
 Pay Sheet Model | edit_workflow
 Pay Sheet Model | paysheet_model_interaction_workflow
 Pay Sheet Model | validation_workflow