[Erp5-report] r21389 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Jun  6 16:39:27 2008
New Revision: 21389

URL: http://svn.erp5.org?rev=21389&view=rev
Log:
PaySheetModelLine_asCellRange: Don't raise string exception; translate base category title

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
    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=21389&r1=21388&r2=21389&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml Fri Jun  6 16:39:27 2008
@@ -80,15 +80,14 @@
   if cell is None:\n
     # This error happens when the cell is not found in the parent model or any\n
     # inherited model.\n
-    raise "PaySheetModelLine_asCellRange Error", "cell is None for %s" % name\n
+    raise ValueError, "PaySheetModelLine_asCellRange: cell is None for %s" % name\n
   return \'%s <= %s < %s\' % (str(cell.getQuantityRangeMin()), name,\n
       str(cell.getQuantityRangeMax()))\n
 \n
 \n
-N_ = context.Base_translateString\n
+translateString = context.Base_translateString\n
 resource = context.getResourceValue()\n
 cell_range = []\n
-tax_category_title = N_(\'(Amount or Percent)\')\n
 \n
 if matrixbox :\n
   if resource is not None:\n
@@ -104,9 +103,9 @@
                       category_item[0])))\n
         elif base_category == \'tax_category\':\n
           category_cell_range.append((category_item[1], \n
-            \' \'.join((category_item[0], tax_category_title))))\n
+            translateString(\'%s (Amount or Percent)\' % category_item[0])))\n
         else:\n
-          raise "PaySheetModelLine_asCellRange Error", "the two categories "\\\n
+          raise ValueError, "PaySheetModelLine_asCellRange: the two categories "\\\n
                 "must could be only tax_category and salary_range"\n
       cell_range.append(category_cell_range)\n
 \n
@@ -175,10 +174,9 @@
                             <string>framing</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>N_</string>
+                            <string>translateString</string>
                             <string>resource</string>
                             <string>cell_range</string>
-                            <string>tax_category_title</string>
                             <string>None</string>
                             <string>base_category_list</string>
                             <string>_getiter_</string>
@@ -187,6 +185,7 @@
                             <string>category_item_list</string>
                             <string>category_item</string>
                             <string>_getitem_</string>
+                            <string>ValueError</string>
                             <string>filter</string>
                             <string>list_of_category_list</string>
                             <string>variation_base_category_list</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21389&r1=21388&r2=21389&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Jun  6 16:39:27 2008
@@ -1,1 +1,1 @@
-249
+250