[Erp5-report] r27785 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 24 11:15:08 CEST 2009
Author: fabien
Date: Wed Jun 24 11:15:07 2009
New Revision: 27785
URL: http://svn.erp5.org?rev=27785&view=rev
Log:
- add more columns on listbox. This will make model_line debugging much more
easier
- add a tales on listbox_create_line, this fix the bug of never checked
checkbox
- remove listbox_create_line_ (not used) and hide listbox_create_line
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/listbox_create_line.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=27785&r1=27784&r2=27785&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] Wed Jun 24 11:15:07 2009
@@ -88,9 +88,9 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>listbox_create_line_</string>
<string>listbox_int_index</string>
<string>listbox_float_index</string>
+ <string>listbox_create_line</string>
</list>
</value>
</item>
@@ -105,7 +105,6 @@
<string>my_price_currency</string>
<string>my_specialise_title_list</string>
<string>my_default_calculation_script_id</string>
- <string>listbox_create_line</string>
</list>
</value>
</item>
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=27785&r1=27784&r2=27785&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] Wed Jun 24 11:15:07 2009
@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>all_columns</string>
<string>columns</string>
<string>editable_columns</string>
<string>portal_types</string>
@@ -80,6 +81,57 @@
<value>
<dictionary>
<item>
+ <key> <string>all_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>int_index</string>
+ <string>Payslip Order</string>
+ </tuple>
+ <tuple>
+ <string>title</string>
+ <string>Title</string>
+ </tuple>
+ <tuple>
+ <string>resource_title</string>
+ <string>Service</string>
+ </tuple>
+ <tuple>
+ <string>reference</string>
+ <string>Reference</string>
+ </tuple>
+ <tuple>
+ <string>description</string>
+ <string>Description</string>
+ </tuple>
+ <tuple>
+ <string>create_line</string>
+ <string>Create Line</string>
+ </tuple>
+ <tuple>
+ <string>trade_phase_title</string>
+ <string>Trade Phase</string>
+ </tuple>
+ <tuple>
+ <string>calculation_script_id</string>
+ <string>Calculation Script</string>
+ </tuple>
+ <tuple>
+ <string>base_contribution_list</string>
+ <string>Base Contribution</string>
+ </tuple>
+ <tuple>
+ <string>base_application_list</string>
+ <string>Base Application</string>
+ </tuple>
+ <tuple>
+ <string>variation_category_list</string>
+ <string>Variation Axes</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
<key> <string>columns</string> </key>
<value>
<list>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml?rev=27785&r1=27784&r2=27785&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml [utf8] Wed Jun 24 11:15:07 2009
@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>description</string>
<string>title</string>
</list>
@@ -57,6 +58,12 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
@@ -84,6 +91,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>description</string> </key>
<value> <string>Usefull for intermediated lines. By default, Pay Sheet Lines are created (checked).</string> </value>
</item>
@@ -109,4 +120,20 @@
</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/isCreateLine</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=27785&r1=27784&r2=27785&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Jun 24 11:15:07 2009
@@ -1,1 +1,1 @@
-480
+481
More information about the Erp5-report
mailing list