[Erp5-report] r10957 - in /erp5/trunk/bt5/erp5_payroll: ActionTemplateItem/portal_types/Pay...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 26 12:31:02 CEST 2006
Author: kevin
Date: Thu Oct 26 12:30:59 2006
New Revision: 10957
URL: http://svn.erp5.org?rev=10957&view=rev
Log:
Fix some UI and fields name.
Calculate taxable grand total on printing.
Modified:
erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/quantity.xml
erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/view.xml
erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%2520Sheet%2520Line/quantity.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/quantity.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/quantity.xml Thu Oct 26 12:30:59 2006
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Pay Sheet Cells</string> </value>
+ <value> <string>Cells</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%2520Sheet%2520Line/view.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/view.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/view.xml Thu Oct 26 12:30:59 2006
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Pay Sheet Line View</string> </value>
+ <value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%2520Sheet%2520Line.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml Thu Oct 26 12:30:59 2006
@@ -112,7 +112,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Pay Sheet Line</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml Thu Oct 26 12:30:59 2006
@@ -215,7 +215,7 @@
</item>
<item>
<key> <string>editable</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>editable_expression</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml Thu Oct 26 12:30:59 2006
@@ -246,6 +246,14 @@
<value>
<dictionary>
<item>
+ <key> <string>allow_creation</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>allow_jump</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
@@ -255,7 +263,17 @@
</item>
<item>
<key> <string>catalog_index</string> </key>
- <value> <string>relative_url</string> </value>
+ <value> <string>title</string> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>container_getter_id</string> </key>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
@@ -314,28 +332,60 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>jump_method</string> </key>
<value> <string>Base_jumpToRelatedDocument</string> </value>
</item>
<item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>parameter_list</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
- <string>Service</string>
- <string>Service</string>
+ <string>Payroll Service</string>
+ <string>Payroll Service</string>
</tuple>
</list>
</value>
@@ -353,8 +403,18 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>size</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>sort</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
<key> <string>title</string> </key>
- <value> <string>Social Service</string> </value>
+ <value> <string>Payroll Service</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getDetails.xml Thu Oct 26 12:30:59 2006
@@ -121,7 +121,7 @@
return None\n
\n
\n
-def getGroupSubLineIdList(group_id=None):\n
+def getGroupSublineIdList(group_id=None):\n
"""\n
This method get the list of subline IDs for a given group.\n
"""\n
@@ -136,10 +136,10 @@
\n
\n
def sublineExist(group_id, subline_id):\n
- return (groupExist(group_id) and subline_id not in [\'\', None] and subline_id in getGroupSubLineIdList(group_id)) and True or False\n
-\n
-\n
-def getSubLine(group_id, subline_id):\n
+ return (groupExist(group_id) and subline_id not in [\'\', None] and subline_id in getGroupSublineIdList(group_id)) and True or False\n
+\n
+\n
+def getSubline(group_id, subline_id):\n
"""\n
This method get subline content based on its ID\n
"""\n
@@ -155,7 +155,7 @@
"""\n
This method update a subline property.\n
"""\n
- subline = getSubLine(group_id, subline_id)\n
+ subline = getSubline(group_id, subline_id)\n
if subline != None:\n
subline[property] = value\n
return\n
@@ -195,7 +195,9 @@
subline_id = "%s/%s" % (service.getId(), salary_range.getId())\n
\n
# Here we decide if a Pay Sheet Line is taxable or not, according its payroll service\n
- # TODO: use a \'taxable\' category to test this in a more generic way\n
+ # TODO: This is a hack, because the code below contain hard-coded IDs. To make this a\n
+ # little bit more generic, an idea could be to use a \'taxable\' category to test\n
+ # this in a more generic way.\n
service_id = service.getId()\n
taxable = False\n
if service_id.endswith(\'non_deductible\') or \\\n
@@ -230,13 +232,13 @@
\n
\n
##############################################################################\n
-# Fill the \'details\' dict with cell and calculated datas.\n
-# Here there is some specific code that must be modified to generic one.\n
+# Fill the \'details\' dict with cells and calculated datas.\n
+# There is some specific code here that must be transformed to generic one.\n
##############################################################################\n
\n
# Get Precision and precise rounding methods\n
-precision = context.getResourceValue().getQuantityPrecision()\n
-r_ = lambda x: context.Base_getRoundValue(x, precision)\n
+currency_precision = context.getResourceValue().getQuantityPrecision()\n
+r_ = lambda x: context.Base_getRoundValue(x, currency_precision)\n
\n
# Scan each pay sheet line and save it in the right place in the data structure\n
for psl in context.objectValues(portal_type=\'Pay Sheet Line\'):\n
@@ -301,8 +303,8 @@
\n
### Default/Standard line group handling\n
else:\n
- cell_rate = cell.getPrice()\n
- cell_base = - cell.getQuantity() # Change sign for beauty\n
+ cell_rate = cell.getPrice()\n
+ cell_base = - cell.getQuantity() # Change sign for beauty\n
# BUG: why cell.getTotalPrice() use the method from Amount instead of the one defined in Movement class ?\n
cell_share = r_(cell_base * cell_rate)\n
\n
@@ -321,7 +323,7 @@
updateSubLine( group_id = cell_group_id\n
, subline_id = cell_subline_id\n
, property = \'%s_rate\' % share_type\n
- , value = \'%.3f %%\' % r_(cell_rate * 100.0) # The "%.3f" format is arbitrary. "3" was choose because there is no rate with precision above 3. Feel Free to update this format if required.\n
+ , value = r_(cell_rate * 100.0)\n
)\n
updateSubLine( group_id = cell_group_id\n
, subline_id = cell_subline_id\n
@@ -339,6 +341,11 @@
elif share_type == \'employer\':\n
total_employer_share = r_(total_employer_share + cell_share)\n
\n
+ # Create taxable salary\n
+ subline = getSubline(group_id=cell_group_id, subline_id=cell_subline_id)\n
+ if subline != None and subline.has_key(\'taxable\') and subline[\'taxable\'] == True and subline[\'employee_share\'] != None:\n
+ taxable_net_salary = r_(taxable_net_salary + subline[\'employee_share\'])\n
+\n
\n
\n
##########################################\n
@@ -349,7 +356,7 @@
\n
details[\'totals\'][\'gross_salary\'] = gross_salary\n
details[\'totals\'][\'net_salary\'] = net_salary\n
-details[\'totals\'][\'taxable_net_salary\'] = taxable_net_salary\n
+details[\'totals\'][\'taxable_net_salary\'] = r_(net_salary + taxable_net_salary)\n
details[\'totals\'][\'total_employer_share\'] = total_employer_share\n
details[\'totals\'][\'total_employee_share\'] = total_employee_share\n
details[\'totals\'][\'total_addendum\'] = total_addendum\n
@@ -361,36 +368,41 @@
# Transform every float value to a string representation according the currency.\n
##############################################################################\n
\n
+# The "three decimals" format is arbitrary. "3" was choose because there is no rate with\n
+# currency_precision above 3. Feel free to update dynamiccaly this format if required.\n
+RATE_PRECISION = 3\n
+\n
# There is 2 kind of numbers to format: rates and amounts.\n
-rate_propertie_list = [\'employer_rate\', \'employee_rate\']\n
-amount_propertie_list = [\'base\', \'employer_share\', \'employee_share\']\n
-\n
-# The "three decimals" format is arbitrary. "3" was choose because there is no rate with\n
-# precision above 3. Feel free to update dynamiccaly this format if required.\n
-RATE_PRECISION = 3\n
+money_format = {\'precision\': currency_precision} #IDEA: put currency symbol as suffix ?\n
+rate_format = {\'precision\': RATE_PRECISION, \'suffix\': "%"}\n
+property_format_dict = { \'base\' : money_format\n
+ , \'employer_rate\' : rate_format\n
+ , \'employer_share\': money_format\n
+ , \'employee_rate\' : rate_format\n
+ , \'employee_share\': money_format\n
+ }\n
\n
# Format each "normal" lines\n
for group_id in getPSLGroupIdList():\n
- for subline_id in getGroupSubLineIdList(group_id=group_id):\n
- subline = getSubLine(group_id=group_id, subline_id=subline_id)\n
+ for subline_id in getGroupSublineIdList(group_id=group_id):\n
+ subline = getSubline(group_id=group_id, subline_id=subline_id)\n
for (property, value) in subline.items():\n
- if same_type(value, 1.0) or same_type(value, 1):\n
- new_value = None\n
- if property in rate_propertie_list:\n
- new_value = (\'%.\' + str(RATE_PRECISION) + \'f\') % value\n
- elif property in amount_propertie_list:\n
- new_value = (\'%.\' + str(precision) + \'f\') % value\n
- if new_value != None:\n
- updateSubLine( group_id = group_id\n
- , subline_id = subline_id\n
- , property = property\n
- , value = new_value\n
- )\n
+ if property_format_dict.has_key(property) and same_type(value, 1.0) or same_type(value, 1):\n
+ format = property_format_dict[property]\n
+ precision = format[\'precision\']\n
+ new_value = (\'%.\' + str(precision) + \'f\') % value\n
+ if format.has_key(\'prefix\'): new_value = \'%s %s\' % (format[\'prefix\'], new_value)\n
+ if format.has_key(\'suffix\'): new_value = \'%s %s\' % (new_value, format[\'suffix\'])\n
+ updateSubLine( group_id = group_id\n
+ , subline_id = subline_id\n
+ , property = property\n
+ , value = new_value\n
+ )\n
\n
# Format totals\n
for (key, value) in details[\'totals\'].items():\n
if same_type(value, 1.0) or same_type(value, 1):\n
- details[\'totals\'][key] = (\'%.\' + str(precision) + \'f\') % value\n
+ details[\'totals\'][key] = (\'%.\' + str(currency_precision) + \'f\') % value\n
\n
\n
return details\n
@@ -458,9 +470,9 @@
<string>groupExist</string>
<string>getGroup</string>
<string>None</string>
- <string>getGroupSubLineIdList</string>
+ <string>getGroupSublineIdList</string>
<string>sublineExist</string>
- <string>getSubLine</string>
+ <string>getSubline</string>
<string>updateSubLine</string>
<string>_getiter_</string>
<string>psl</string>
@@ -483,7 +495,7 @@
<string>new_subline</string>
<string>groups</string>
<string>old_group</string>
- <string>precision</string>
+ <string>currency_precision</string>
<string>r_</string>
<string>cell</string>
<string>tax_category_path</string>
@@ -496,15 +508,18 @@
<string>cell_rate</string>
<string>cell_base</string>
<string>cell_share</string>
- <string>rate_propertie_list</string>
- <string>amount_propertie_list</string>
+ <string>subline</string>
<string>RATE_PRECISION</string>
- <string>subline</string>
+ <string>money_format</string>
+ <string>rate_format</string>
+ <string>property_format_dict</string>
<string>property</string>
<string>value</string>
<string>same_type</string>
+ <string>format</string>
+ <string>precision</string>
+ <string>str</string>
<string>new_value</string>
- <string>str</string>
<string>key</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml Thu Oct 26 12:30:59 2006
@@ -343,7 +343,7 @@
</tuple>
<tuple>
<string>description</string>
- <string>Comment</string>
+ <string>Description</string>
</tuple>
<tuple>
<string>resource_title</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml Thu Oct 26 12:30:59 2006
@@ -316,6 +316,35 @@
<item>
<key> <string>all_columns</string> </key>
<value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>all_editable_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>base</string>
+ <string>Base Value</string>
+ </tuple>
+ <tuple>
+ <string>employer_share_rate</string>
+ <string>Employer Share Rate (%)</string>
+ </tuple>
+ <tuple>
+ <string>employee_share_rate</string>
+ <string>Employee Share Rate (%)</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
<list>
<tuple>
<string>service_title</string>
@@ -339,25 +368,61 @@
</tuple>
<tuple>
<string>description</string>
- <string>Comment</string>
+ <string>Description</string>
</tuple>
<tuple>
<string>service_id</string>
- <string>Service ID</string>
+<string></string>
</tuple>
<tuple>
<string>salary_range</string>
- <string>Salary Range</string>
+<string></string>
</tuple>
<tuple>
<string>tax_category</string>
- <string>Tax Category</string>
+<string></string>
</tuple>
</list>
</value>
</item>
<item>
- <key> <string>all_editable_columns</string> </key>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_root_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>domain_tree</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -365,37 +430,6 @@
<string>Base Value</string>
</tuple>
<tuple>
- <string>employer_share_rate</string>
- <string>Employer Share Rate (%)</string>
- </tuple>
- <tuple>
- <string>employee_share_rate</string>
- <string>Employee Share Rate (%)</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>service_title</string>
- <string>Contribution</string>
- </tuple>
- <tuple>
- <string>salary_range_title</string>
- <string>Base Type</string>
- </tuple>
- <tuple>
- <string>base</string>
- <string>Base Value</string>
- </tuple>
- <tuple>
<string>employer_share</string>
<string>Employer Share</string>
</tuple>
@@ -405,7 +439,7 @@
</tuple>
<tuple>
<string>description</string>
- <string>Comment</string>
+ <string>Description</string>
</tuple>
<tuple>
<string>service_id</string>
@@ -418,77 +452,6 @@
<tuple>
<string>tax_category</string>
<string></string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>base</string>
- <string>Base Value</string>
- </tuple>
- <tuple>
- <string>employer_share</string>
- <string>Employer Share</string>
- </tuple>
- <tuple>
- <string>employee_share</string>
- <string>Employee Share</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Comment</string>
- </tuple>
- <tuple>
- <string>service_id</string>
- <string>Service ID</string>
- </tuple>
- <tuple>
- <string>salary_range</string>
- <string>Salary Range</string>
- </tuple>
- <tuple>
- <string>tax_category</string>
- <string>Tax Category</string>
</tuple>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml Thu Oct 26 12:30:59 2006
@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Comment</string> </value>
+ <value> <string>Description</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=10957&r1=10956&r2=10957&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Thu Oct 26 12:30:59 2006
@@ -1,1 +1,1 @@
-111
+115
More information about the Erp5-report
mailing list