[Erp5-report] r10842 - /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 20 11:59:23 CEST 2006
Author: kevin
Date: Fri Oct 20 11:59:22 2006
New Revision: 10842
URL: http://svn.erp5.org?rev=10842&view=rev
Log:
Change matrix box rendering dynamically depending of the type of the contribution.
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_price.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml?rev=10842&r1=10841&r2=10842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml Fri Oct 20 11:59:22 2006
@@ -259,11 +259,11 @@
<list>
<tuple>
<string>quantity</string>
- <string>Base Salary</string>
+ <string>Base Value</string>
</tuple>
<tuple>
<string>price</string>
- <string>Rate</string>
+ <string>Share</string>
</tuple>
</list>
</value>
@@ -331,7 +331,7 @@
<list>
<tuple>
<string>None</string>
- <string>Salary base</string>
+ <string>Base Value</string>
</tuple>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_price.xml?rev=10842&r1=10841&r2=10842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_price.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_price.xml Fri Oct 20 11:59:22 2006
@@ -156,7 +156,9 @@
</item>
<item>
<key> <string>input_style</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>precision</string> </key>
@@ -203,7 +205,7 @@
</item>
<item>
<key> <string>display_width</string> </key>
- <value> <int>5</int> </value>
+ <value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
@@ -259,7 +261,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Price</string> </value>
+ <value> <string>Share</string> </value>
</item>
<item>
<key> <string>viewable_expression</string> </key>
@@ -302,4 +304,23 @@
</dictionary>
</pickle>
</record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: (\'salary_range/france\' in cell.getCategoryList() or \'salary_range/france/forfait\' in cell.getCategoryList()) and "-1 234.5" or "-12.3%"</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml?rev=10842&r1=10841&r2=10842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml Fri Oct 20 11:59:22 2006
@@ -146,6 +146,16 @@
</item>
<item>
<key> <string>hidden</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -245,7 +255,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Quantity</string> </value>
+ <value> <string>Base Value</string> </value>
</item>
<item>
<key> <string>viewable_expression</string> </key>
@@ -288,4 +298,23 @@
</dictionary>
</pickle>
</record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: (\'salary_range/france\' in cell.getCategoryList() or \'salary_range/france/forfait\' in cell.getCategoryList()) and True or False</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
More information about the Erp5-report
mailing list