Commit b7db361e authored by Fabien Morin's avatar Fabien Morin

- 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
parent f3987d03
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</item> </item>
<item> <item>
<key> <string>content_icon</string> </key> <key> <string>content_icon</string> </key>
<value> <string>order_line_icon.gif</string> </value> <value> <string>file_icon.gif</string> </value>
</item> </item>
<item> <item>
<key> <string>content_meta_type</string> </key> <key> <string>content_meta_type</string> </key>
......
...@@ -5,27 +5,27 @@ ...@@ -5,27 +5,27 @@
</chain> </chain>
<chain> <chain>
<type>Pay Sheet Cell</type> <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>
<chain> <chain>
<type>Pay Sheet Line</type> <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>
<chain> <chain>
<type>Pay Sheet Model</type> <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>
<chain> <chain>
<type>Pay Sheet Model Line</type> <type>Pay Sheet Model Line</type>
<workflow>edit_workflow</workflow> <workflow>trade_matrix_workflow, edit_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>Pay Sheet Transaction</type> <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>
<chain> <chain>
<type>Pay Sheet Transaction Line</type> <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>
<chain> <chain>
<type>Payroll Service</type> <type>Payroll Service</type>
......
...@@ -13,14 +13,13 @@ ...@@ -13,14 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_attributes</string>
<string>title</string> <string>title</string>
<string>tabs</string>
<string>lines</string>
<string>cell_base_id</string> <string>cell_base_id</string>
<string>cell_portal_type</string> <string>cell_portal_type</string>
<string>update_cell_range</string> <string>lines</string>
<string>columns</string> <string>columns</string>
<string>tabs</string>
<string>editable_attributes</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -175,10 +174,6 @@ ...@@ -175,10 +174,6 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Cells</string> </value> <value> <string>Cells</string> </value>
</item> </item>
<item>
<key> <string>update_cell_range</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -13,15 +13,14 @@ ...@@ -13,15 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>cell_portal_type</string>
<string>editable_attributes</string>
<string>title</string> <string>title</string>
<string>global_attributes</string>
<string>cell_base_id</string> <string>cell_base_id</string>
<string>update_cell_range</string> <string>cell_portal_type</string>
<string>tabs</string>
<string>lines</string> <string>lines</string>
<string>columns</string> <string>columns</string>
<string>tabs</string>
<string>editable_attributes</string>
<string>global_attributes</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -108,6 +107,12 @@ ...@@ -108,6 +107,12 @@
<key> <string>cell_portal_type</string> </key> <key> <string>cell_portal_type</string> </key>
<value> <string>Pay Sheet Cell</string> </value> <value> <string>Pay Sheet Cell</string> </value>
</item> </item>
<item>
<key> <string>columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>editable_attributes</string> </key> <key> <string>editable_attributes</string> </key>
<value> <value>
...@@ -150,6 +155,18 @@ ...@@ -150,6 +155,18 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>lines</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>tabs</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
...@@ -158,10 +175,6 @@ ...@@ -158,10 +175,6 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>matrixbox</string> </value> <value> <string>matrixbox</string> </value>
</item> </item>
<item>
<key> <string>update_cell_range</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
404 408
\ No newline at end of file \ No newline at end of file
...@@ -5,7 +5,9 @@ Pay Sheet Cell | edit_workflow ...@@ -5,7 +5,9 @@ Pay Sheet Cell | edit_workflow
Pay Sheet Line | delivery_movement_causality_interaction_workflow Pay Sheet Line | delivery_movement_causality_interaction_workflow
Pay Sheet Line | delivery_movement_simulation_interaction_workflow Pay Sheet Line | delivery_movement_simulation_interaction_workflow
Pay Sheet Line | edit_workflow Pay Sheet Line | edit_workflow
Pay Sheet Line | trade_matrix_workflow
Pay Sheet Model Line | edit_workflow Pay Sheet Model Line | edit_workflow
Pay Sheet Model Line | trade_matrix_workflow
Pay Sheet Model | edit_workflow Pay Sheet Model | edit_workflow
Pay Sheet Model | paysheet_model_interaction_workflow Pay Sheet Model | paysheet_model_interaction_workflow
Pay Sheet Model | validation_workflow Pay Sheet Model | validation_workflow
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment