[Erp5-report] r27433 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 8 17:14:54 CEST 2009
Author: fabien
Date: Mon Jun 8 17:14:51 2009
New Revision: 27433
URL: http://svn.erp5.org?rev=27433&view=rev
Log:
- remove the field editable from the listbox because this property has been removed. Add create_paysheet_line checkbox, that permit to define if the line is normal line or intermediate one (create it or not)
- make possible to specialise a business process
- remove the field my_social_insurance_annotation_line_source_title because now this is defined on the business process
Added:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml?rev=27433&r1=27432&r2=27433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml [utf8] Mon Jun 8 17:14:51 2009
@@ -88,7 +88,7 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>listbox_editable</string>
+ <string>listbox_create_paysheet_line</string>
<string>listbox_int_index</string>
<string>listbox_float_index</string>
</list>
@@ -102,7 +102,6 @@
<string>my_reference</string>
<string>my_destination_section_title</string>
<string>my_source_section_title</string>
- <string>my_social_insurance_annotation_line_source_title</string>
<string>my_price_currency</string>
<string>my_specialise_title_list</string>
<string>my_default_calculation_script_id</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml?rev=27433&r1=27432&r2=27433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml [utf8] Mon Jun 8 17:14:51 2009
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>columns</string>
<string>editable_columns</string>
+ <string>portal_types</string>
+ <string>selection_name</string>
+ <string>sort</string>
<string>title</string>
- <string>selection_name</string>
- <string>columns</string>
- <string>sort</string>
- <string>portal_types</string>
</list>
</value>
</item>
@@ -108,8 +108,8 @@
<string>Description</string>
</tuple>
<tuple>
- <string>editable</string>
- <string>Editable</string>
+ <string>create_paysheet_line</string>
+ <string>Create Pay Sheet Line</string>
</tuple>
</list>
</value>
@@ -119,8 +119,8 @@
<value>
<list>
<tuple>
- <string>editable</string>
- <string>editable</string>
+ <string>create_paysheet_line</string>
+ <string>Create Pay Sheet Line</string>
</tuple>
<tuple>
<string>int_index</string>
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml?rev=27433&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml [utf8] Mon Jun 8 17:14:51 2009
@@ -1,0 +1,130 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>default</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_create_paysheet_line</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_checkbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Create Pay Sheet Line</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>cell/isCreatePaysheetLine</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml?rev=27433&r1=27432&r2=27433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml [utf8] Mon Jun 8 17:14:51 2009
@@ -107,6 +107,10 @@
<string>Pay Sheet Model</string>
<string>Pay Sheet Model</string>
</tuple>
+ <tuple>
+ <string>Business Process</string>
+ <string>Business Process</string>
+ </tuple>
</list>
</value>
</item>
@@ -117,6 +121,10 @@
<tuple>
<string>PaySheetModelModule_viewPaySheetModelList/listbox</string>
<string>Pay Sheet Models</string>
+ </tuple>
+ <tuple>
+ <string>BusinessProcessModule_viewBusinessProcessList/listbox</string>
+ <string>Business Process</string>
</tuple>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=27433&r1=27432&r2=27433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Mon Jun 8 17:14:51 2009
@@ -1,1 +1,1 @@
-441
+442
More information about the Erp5-report
mailing list