[Erp5-report] r25226 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 21 12:56:12 CET 2009
Author: fabien
Date: Wed Jan 21 12:56:10 2009
New Revision: 25226
URL: http://svn.erp5.org?rev=25226&view=rev
Log:
2009-01-21 fabien
* remove unused field base_amount_list
* change error messages in PaySheetTransaction_checkParameters to be consistant with other translations
* translate a message in PaySheetModelLine_asCellRange
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml?rev=25226&r1=25225&r2=25226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml [utf8] Wed Jan 21 12:56:10 2009
@@ -58,6 +58,7 @@
\'\'\'\n
return a list of slice items\n
\'\'\'\n
+translateString = context.Base_translateString\n
\n
def framing(cell, name):\n
\'\'\'\n
@@ -68,14 +69,12 @@
if cell is None:\n
# This error happens when the cell is not found in the parent model or any\n
# inherited model.\n
- return "%s (slice not defined)" % name\n
+ return "%s (%s)" % (name, translateString(\'slice not defined\'))\n
\n
return \'%s <= %s < %s\' % (cell.getQuantityRangeMin(),\n
name,\n
cell.getQuantityRangeMax())\n
\n
-\n
-translateString = context.Base_translateString\n
resource = context.getResourceValue()\n
cell_range = []\n
\n
@@ -110,6 +109,8 @@
list_of_category_list.append(\\\n
context.getVariationCategoryList(base_category_list=base_category))\n
return list_of_category_list\n
+\n
+return []\n
]]></string> </value>
@@ -151,10 +152,10 @@
<string>matrixbox</string>
<string>base_id</string>
<string>kw</string>
- <string>framing</string>
<string>_getattr_</string>
<string>context</string>
<string>translateString</string>
+ <string>framing</string>
<string>resource</string>
<string>cell_range</string>
<string>None</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml?rev=25226&r1=25225&r2=25226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml [utf8] Wed Jan 21 12:56:10 2009
@@ -115,7 +115,6 @@
<key> <string>right</string> </key>
<value>
<list>
- <string>my_base_amount_list</string>
<string>my_variation_category_list</string>
<string>my_base_contribution_list</string>
<string>my_base_application_list</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml?rev=25226&r1=25225&r2=25226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml [utf8] Wed Jan 21 12:56:10 2009
@@ -61,6 +61,7 @@
paysheet_type = paysheet.getPortalType()\n
employer = paysheet.getDestinationSection()\n
employee = paysheet.getSourceSection()\n
+quantity_unit = paysheet.getWorkTimeAnnotationLineQuantityUnit()\n
\n
Base_translateString = context.Base_translateString\n
\n
@@ -69,16 +70,22 @@
keep_items=dict(portal_status_message=Base_translateString(msg)))\n
\n
if not paysheet.getPriceCurrency():\n
- return redirect(\'Currency is required\')\n
+ return redirect(\'Currency must be defined\')\n
\n
if not paysheet.getStartDate():\n
- return redirect(\'Date is required\')\n
+ return redirect(\'Work Period Start must be defined\')\n
+\n
+if not paysheet.getStopDate():\n
+ return redirect(\'Work Period End must be defined\')\n
\n
if not employee:\n
- return redirect(\'The employee is required\')\n
+ return redirect(\'The employee must be defined\')\n
\n
if not employer:\n
- return redirect(\'The employer is required\')\n
+ return redirect(\'The employer must be defined\')\n
+\n
+if not quantity_unit:\n
+ return redirect(\'The work duration unit must be defined\')\n
\n
employer_obj = paysheet.getDestinationSectionValue()\n
employee_obj = paysheet.getSourceSectionValue()\n
@@ -136,6 +143,7 @@
<string>paysheet_type</string>
<string>employer</string>
<string>employee</string>
+ <string>quantity_unit</string>
<string>Base_translateString</string>
<string>redirect</string>
<string>employer_obj</string>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=25226&r1=25225&r2=25226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Wed Jan 21 12:56:10 2009
@@ -1,3 +1,8 @@
+2009-01-21 fabien
+* remove unused field base_amount_list
+* change error messages in PaySheetTransaction_checkParameters to be consistant with other translations
+* translate a message in PaySheetModelLine_asCellRange
+
2009-01-16 fabien
* add a checkbox on Pay Sheet Model Line to create or not the related Pay Sheet Line
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25226&r1=25225&r2=25226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Jan 21 12:56:10 2009
@@ -1,1 +1,1 @@
-337
+339
More information about the Erp5-report
mailing list