[Erp5-report] r14948 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Jun 25 12:21:26 2007
New Revision: 14948

URL: http://svn.erp5.org?rev=14948&view=rev
Log:
Fix listbox selection name.
Baobab_checkCounterDateOpen must raise in case of an error instead of returning a boolean value.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml?rev=14948&r1=14947&r2=14948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml Mon Jun 25 12:21:26 2007
@@ -65,7 +65,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string># return 1 if the counter date is open/closing for the given date and the given site\n
+            <value> <string># Raise ValidationFailed if the counter date not opened for the given date and the given site\n
+\n
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+from Products.ERP5Type.Message import Message\n
 \n
 if date is None:\n
   # get current date\n
@@ -89,9 +92,8 @@
 site = context.Baobab_getVaultSite(site)\n
 \n
 if context.portal_catalog.countResults(portal_type=\'Counter Date\', start_date=str(date), site_id=site.getId(), simulation_state="open")[0][0] == 0:\n
-  return 0\n
-else:\n
-  return 1\n
+  msg = Message(domain = "ui", message="Transaction not in the good counter date")\n
+  raise ValidationFailed, (msg,)\n
 </string> </value>
         </item>
         <item>
@@ -150,6 +152,10 @@
                           <tuple>
                             <string>site</string>
                             <string>date</string>
+                            <string>Products.DCWorkflow.DCWorkflow</string>
+                            <string>ValidationFailed</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>None</string>
                             <string>DateTime</string>
                             <string>_getattr_</string>
@@ -158,6 +164,7 @@
                             <string>len</string>
                             <string>_getitem_</string>
                             <string>str</string>
+                            <string>msg</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml?rev=14948&r1=14947&r2=14948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml Mon Jun 25 12:21:26 2007
@@ -481,7 +481,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>accounting_date_list_selection</string> </value>
+                    <value> <string>counter_date_list_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=14948&r1=14947&r2=14948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Mon Jun 25 12:21:26 2007
@@ -1,1 +1,1 @@
-285
+286