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

[nobody at svn.erp5.org]

Author: kevin
Date: Wed Oct 25 17:15:50 2006
New Revision: 10940

URL: http://svn.erp5.org?rev=10940&view=rev
Log:
Check currency.

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision
    erp5/trunk/bt5/erp5_payroll/bt/version

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=10940&r1=10939&r2=10940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml Wed Oct 25 17:15:50 2006
@@ -70,6 +70,10 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
+"""\n
+  Check that all datas necessary to auto-calculate the pay sheet are set.\n
+  TODO: Translate portal status message.\n
+"""\n
 paysheet      = context.getObject()\n
 paysheet_type = paysheet.getPortalType()\n
 employee      = paysheet.getDestinationSection()\n
@@ -77,6 +81,9 @@
 \n
 if paysheet.getGrossSalary() == None:\n
   return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_status_message=Gross+salary+is+required\')\n
+\n
+if paysheet.getResource() == None:\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_status_message=Currency+is+required\')\n
 \n
 if paysheet.getStartDate() == None:\n
   return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_status_message=Start+date+is+required\')\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=10940&r1=10939&r2=10940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Wed Oct 25 17:15:50 2006
@@ -1,1 +1,1 @@
-95
+98

Modified: erp5/trunk/bt5/erp5_payroll/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/version?rev=10940&r1=10939&r2=10940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/version (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/version Wed Oct 25 17:15:50 2006
@@ -1,1 +1,1 @@
-0.2.3
+0.2.4