[Erp5-report] r27028 - in /erp5/trunk/bt5/erp5_payroll: PortalTypeTemplateItem/portal_types...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon May 18 16:38:14 CEST 2009
Author: fabien
Date: Mon May 18 16:38:12 2009
New Revision: 27028
URL: http://svn.erp5.org?rev=27028&view=rev
Log:
- 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.
Modified:
erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml
erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%2520Sheet%2520Line.xml?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml [utf8] Mon May 18 16:38:12 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Mon May 18 16:38:12 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml [utf8] Mon May 18 16:38:12 2009
@@ -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>
@@ -174,10 +173,6 @@
<item>
<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>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml [utf8] Mon May 18 16:38:12 2009
@@ -13,15 +13,14 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>title</string>
+ <string>cell_base_id</string>
<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>lines</string>
<string>columns</string>
+ <string>tabs</string>
+ <string>editable_attributes</string>
+ <string>global_attributes</string>
</list>
</value>
</item>
@@ -109,6 +108,12 @@
<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>
<list>
@@ -151,6 +156,18 @@
</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>
</item>
@@ -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>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Mon May 18 16:38:12 2009
@@ -1,1 +1,1 @@
-404
+408
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list?rev=27028&r1=27027&r2=27028&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list [utf8] Mon May 18 16:38:12 2009
@@ -5,7 +5,9 @@
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
More information about the Erp5-report
mailing list