[Erp5-report] r43554 aurel - in /erp5/trunk/bt5/erp5_payroll: PortalTypeWorkflowChainTempla...

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Feb 22 13:43:24 2011
New Revision: 43554

URL: http://svn.erp5.org?rev=43554&view=rev
Log:
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

Modified:
    erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.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/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=43554&r1=43553&r2=43554&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] Tue Feb 22 13:43:24 2011
@@ -16,6 +16,10 @@
   <workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow>
  </chain>
  <chain>
+  <type>Pay Sheet Model Cell</type>
+  <workflow>trade_model_cell_interaction_workflow</workflow>
+ </chain>
+ <chain>
   <type>Pay Sheet Model Line</type>
   <workflow>edit_workflow, trade_matrix_workflow</workflow>
  </chain>
@@ -27,4 +31,4 @@
   <type>Pay Sheet Transaction Line</type>
   <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
  </chain>
-</workflow_chain>
\ No newline at end of file
+</workflow_chain>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=43554&r1=43553&r2=43554&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] Tue Feb 22 13:43:24 2011
@@ -116,7 +116,7 @@ for paysheet_line in paysheet_line_list:
 \n
     base = cell.getQuantity()\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+\'_quantity\'] = cell.getQuantity()\n
     share_dict[cell_contribution_share+\'_total_price\'] = \\\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=43554&r1=43553&r2=43554&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Feb 22 13:43:24 2011
@@ -1 +1 @@
-580
\ No newline at end of file
+582

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=43554&r1=43553&r2=43554&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] Tue Feb 22 13:43:24 2011
@@ -6,6 +6,7 @@ Pay Sheet Line | delivery_movement_causa
 Pay Sheet Line | delivery_movement_simulation_interaction_workflow
 Pay Sheet Line | edit_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 | trade_matrix_workflow
 Pay Sheet Model | edit_workflow
@@ -18,4 +19,4 @@ Pay Sheet Transaction | accounting_workf
 Pay Sheet Transaction | delivery_causality_interaction_workflow
 Pay Sheet Transaction | delivery_causality_workflow
 Pay Sheet Transaction | delivery_simulation_interaction_workflow
-Pay Sheet Transaction | edit_workflow
\ No newline at end of file
+Pay Sheet Transaction | edit_workflow