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

[nobody at svn.erp5.org]

Author: seb
Date: Wed Feb 13 11:23:04 2008
New Revision: 19293

URL: http://svn.erp5.org?rev=19293&view=rev
Log:
- money deposit should block the action of closing the couter date only in the
confirmed state
- allow to disable the check of the current date when closing the counter date,
this is enabled by default, but usefull to disable it in unit test

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
    erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml?rev=19293&r1=19292&r2=19293&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml Wed Feb 13 11:23:04 2008
@@ -104,6 +104,8 @@
                 (simulation_state in (\'stopped\') and site_url in document.getDestination()))\n
              ):\n
           continue\n
+      if portal_type in (\'Money Deposit\',) and simulation_state not in (\'confirmed\',):\n
+        continue\n
       append(document)\n
 \n
 def operation_sort(a,b):\n

Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml?rev=19293&r1=19292&r2=19293&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml Wed Feb 13 11:23:04 2008
@@ -92,7 +92,8 @@
 from DateTime import DateTime\n
 now = DateTime()\n
 \n
-if now.Date() != start_date.Date():\n
+check_date_is_today = state_change.kwargs.get(\'check_date_is_today\', 1)\n
+if check_date_is_today and now.Date() != start_date.Date():\n
   msg = Message(domain=\'ui\',message="Sorry, the date is not today")\n
   raise ValidationFailed (msg,)\n
 \n
@@ -188,6 +189,7 @@
                             <string>start_date</string>
                             <string>DateTime</string>
                             <string>now</string>
+                            <string>check_date_is_today</string>
                             <string>line</string>
                             <string>context</string>
                             <string>counter</string>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=19293&r1=19292&r2=19293&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Wed Feb 13 11:23:04 2008
@@ -1,1 +1,1 @@
-418
+419