From 92b5a1b27efef09d25603f16808a3ff6ee31e205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Wed, 23 Jan 2008 09:54:09 +0000
Subject: [PATCH] must check counter is opened

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18835 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../scripts/validatePositionAccounting.xml                | 4 +---
 .../check_payment_workflow/transitions/reject_action.xml  | 2 +-
 .../scripts/validatePositionAccounting.xml                | 8 --------
 bt5/erp5_banking_check/bt/revision                        | 2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml
index 81ea735265..13e356235a 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.xml
@@ -80,9 +80,7 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n
 \n
 site = transaction.getSourceValue()\n
 \n
-#if not transaction.Baobab_checkCounterOpened(site):\n
-#  msg = Message(domain = "ui", message="Counter is not opened")\n
-#  raise ValidationFailed, (msg,)\n
+transaction.Baobab_checkCounterOpened(site)\n
 \n
 # For safety, check the consistency again.\n
 context.validateConsistency(state_change)\n
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/reject_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/reject_action.xml
index 25d79de720..e0e92461fb 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/reject_action.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/reject_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Return On Error</string> </value>
+            <value> <string>Reject</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.xml
index eafbc084ab..92a8c55851 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.xml
@@ -86,14 +86,6 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=date)\n
 \n
 context.Baobab_checkCounterOpened(source)\n
 \n
-\n
-#site = transaction.getSourceValue()\n
-\n
-#if \'guichet\' in site.getVaultType():\n
-#  if not context.Baobab_checkCounterOpened(site):\n
-#    msg = Message(domain = "ui", message="Counter is not opened")\n
-#    raise ValidationFailed, (msg,)\n
-\n
 # First we have to look if we have some checks with some prices,\n
 # if so, this means that we are saling such kinds of check, thus\n
 # we must change the position of the customer account\n
diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision
index e24b797f8d..6c0c8340ea 100644
--- a/bt5/erp5_banking_check/bt/revision
+++ b/bt5/erp5_banking_check/bt/revision
@@ -1 +1 @@
-361
\ No newline at end of file
+362
\ No newline at end of file
-- 
2.30.9