[Erp5-report] r6670 - in /erp5/trunk/bt5/erp5_payroll: ActionTemplateItem/portal_types/ Por...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Apr 14 19:58:54 CEST 2006


Author: kevin
Date: Fri Apr 14 19:58:52 2006
New Revision: 6670

URL: http://svn.erp5.org?rev=6670&view=rev
Log:
Synchonize with last erp5devel version

Added:
    erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/
    erp5/trunk/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
    erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
    erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

Added: erp5/trunk/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=6670&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Fri Apr 14 19:58:52 2006
@@ -1,0 +1,9 @@
+<allowed_content_type_list>
+ <portal_type id="Pay Sheet Line">
+  <item>Pay Sheet Cell</item>
+ </portal_type>
+ <portal_type id="Pay Sheet Transaction">
+  <item>Pay Sheet Line</item>
+  <item>Pay Sheet Transaction Line</item>
+ </portal_type>
+</allowed_content_type_list>

Added: erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml?rev=6670&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml Fri Apr 14 19:58:52 2006
@@ -1,0 +1,11 @@
+<base_category_list>
+ <portal_type id="Pay Sheet Cell">
+  <item>tax_category</item>
+  <item>product_line</item>
+  <item>salary_range</item>
+ </portal_type>
+ <portal_type id="Pay Sheet Line">
+  <item>salary_range</item>
+  <item>tax_category</item>
+ </portal_type>
+</base_category_list>

Added: 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=6670&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Fri Apr 14 19:58:52 2006
@@ -1,0 +1,18 @@
+<workflow_chain>
+ <chain>
+  <type>Pay Sheet Cell</type>
+  <workflow>delivery_edit_workflow, edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Pay Sheet Line</type>
+  <workflow>delivery_edit_workflow, edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Pay Sheet Transaction</type>
+  <workflow>edit_workflow, accounting_workflow, delivery_edit_workflow</workflow>
+ </chain>
+ <chain>
+  <type>Pay Sheet Transaction Line</type>
+  <workflow>edit_workflow, delivery_edit_workflow</workflow>
+ </chain>
+</workflow_chain>




More information about the Erp5-report mailing list