Commit 457fab2e authored by Aurel's avatar Aurel

Update to use again services' variations on pay sheet model lines :

- use trade_model_cell_interaction_workflow on pay sheet model cell
- revert changes on PaySheetTransaction_getMovementList


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43554 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 25e59495
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
<type>Pay Sheet Model</type> <type>Pay Sheet Model</type>
<workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow> <workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow>
</chain> </chain>
<chain>
<type>Pay Sheet Model Cell</type>
<workflow>trade_model_cell_interaction_workflow</workflow>
</chain>
<chain> <chain>
<type>Pay Sheet Model Line</type> <type>Pay Sheet Model Line</type>
<workflow>edit_workflow, trade_matrix_workflow</workflow> <workflow>edit_workflow, trade_matrix_workflow</workflow>
...@@ -27,4 +31,4 @@ ...@@ -27,4 +31,4 @@
<type>Pay Sheet Transaction Line</type> <type>Pay Sheet Transaction Line</type>
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow> <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
</chain> </chain>
</workflow_chain> </workflow_chain>
\ No newline at end of file
...@@ -116,7 +116,7 @@ for paysheet_line in paysheet_line_list:\n ...@@ -116,7 +116,7 @@ for paysheet_line in paysheet_line_list:\n
\n \n
base = cell.getQuantity()\n base = cell.getQuantity()\n
\n \n
cell_contribution_share = cell.getBaseContributionId() or cell.getBaseApplicationId() or \'\'\n cell_contribution_share = cell.getContributionShare() or \'\'\n
share_dict[cell_contribution_share+\'_price\'] = cell.getPrice()\n share_dict[cell_contribution_share+\'_price\'] = cell.getPrice()\n
share_dict[cell_contribution_share+\'_quantity\'] = cell.getQuantity()\n share_dict[cell_contribution_share+\'_quantity\'] = cell.getQuantity()\n
share_dict[cell_contribution_share+\'_total_price\'] = \\\n share_dict[cell_contribution_share+\'_total_price\'] = \\\n
......
580 582
\ No newline at end of file
...@@ -6,6 +6,7 @@ Pay Sheet Line | delivery_movement_causality_interaction_workflow ...@@ -6,6 +6,7 @@ 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 Line | trade_matrix_workflow
Pay Sheet Model Cell | trade_model_cell_interaction_workflow
Pay Sheet Model Line | edit_workflow Pay Sheet Model Line | edit_workflow
Pay Sheet Model Line | trade_matrix_workflow Pay Sheet Model Line | trade_matrix_workflow
Pay Sheet Model | edit_workflow Pay Sheet Model | edit_workflow
...@@ -18,4 +19,4 @@ Pay Sheet Transaction | accounting_workflow ...@@ -18,4 +19,4 @@ Pay Sheet Transaction | accounting_workflow
Pay Sheet Transaction | delivery_causality_interaction_workflow Pay Sheet Transaction | delivery_causality_interaction_workflow
Pay Sheet Transaction | delivery_causality_workflow Pay Sheet Transaction | delivery_causality_workflow
Pay Sheet Transaction | delivery_simulation_interaction_workflow Pay Sheet Transaction | delivery_simulation_interaction_workflow
Pay Sheet Transaction | edit_workflow Pay Sheet Transaction | edit_workflow
\ No newline at end of file
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