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

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25227 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml

@@ -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 @@ def framing(cell, name):\n
   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 @@ else:\n
     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 @@ else:\n
                             <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>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml

@@ -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>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_amount_list.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>my_base_amount_list</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>my_base_amount_list</string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string>Click to edit the target</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml

@@ -61,6 +61,7 @@ paysheet      = context.getObject()\n
 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 @@ def redirect(msg):\n
       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 @@ return context.PaySheetTransaction_viewPreview(container.REQUEST)\n
                             <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>

bt5/erp5_payroll/bt/change_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
+
 2009-01-16 fabien
 * add a checkbox on Pay Sheet Model Line to create or not the related Pay Sheet Line
 

bt5/erp5_payroll/bt/revision

-337
\ No newline at end of file
+339
\ No newline at end of file