fixed two worklists

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

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml

@@ -70,23 +70,22 @@ from Products.ERP5Type.Message import Message\n
 \n
 transaction = state_change[\'object\']\n
 \n
-caisse = transaction.getSource()\n
+vault = transaction.getSource()\n
 \n
 \n
-if (\'encaisse_des_billets_et_monnaies\'  not in caisse):\n
+if (\'encaisse_des_billets_et_monnaies\'  not in vault):\n
    msg = Message(domain="ui", message="Invalid source.")\n
    raise ValidationFailed, (msg,)\n
 \n
 # check again that we are in the good accounting date\n
-transaction.Baobab_checkCounterDateOpen(site=caisse, date=transaction.getStartDate())\n
+transaction.Baobab_checkCounterDateOpen(site=vault, date=transaction.getStartDate())\n
 \n
 \n
-resource_one = transaction.CashDelivery_checkCounterInventory(source = caisse, portal_type=\'Incoming Cash Balance Regulation Line\')\n
-resource_two = transaction.CashDelivery_checkCounterInventory(source = caisse, \n
+resource_one = transaction.CashDelivery_checkCounterInventory(source = vault, portal_type=\'Incoming Cash Balance Regulation Line\')\n
+resource_two = transaction.CashDelivery_checkCounterInventory(source = vault, \n
                                portal_type=\'Outgoing Cash Balance Regulation Line\', \n
                                same_source=1,\n
                                no_balance_check=1)\n
-#resource_two = transaction.CashDelivery_checkCounterInventory(source = caisse, portal_type=\'Outgoing Cash Balance Regulation Line\')\n
 \n
 #context.log(\'resource_one\', resource_one)\n
 #context.log(\'resource_two\', resource_two)\n
@@ -167,7 +166,7 @@ if incoming_total != outgoing_total:\n
                             <string>_getitem_</string>
                             <string>transaction</string>
                             <string>_getattr_</string>
-                            <string>caisse</string>
+                            <string>vault</string>
                             <string>msg</string>
                             <string>resource_one</string>
                             <string>resource_two</string>

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml

@@ -110,15 +110,12 @@ check_path_script = getattr(transaction,\'%s_checkPath\' % portal_type_with_no_s
 if not transaction.isCurrencyHandover():\n
   # check again that we are in the good accounting date\n
   transaction.Baobab_checkCounterDateOpen(site=vault, date=transaction.getStartDate())\n
-  if check_path_script is not None:\n
-    message = check_path_script()\n
-    transaction.log(\'check_path_script\',\'found\')\n
-    if message is not None:\n
-      raise ValidationFailed, (message,)\n
-else:\n
-  if \'devise\' not in vault:\n
-    msg = Message(domain="ui", message="Sorry, you must define a currency source.")\n
-    raise ValidationFailed, (msg,)\n
+\n
+if check_path_script is not None:\n
+  message = check_path_script()\n
+  transaction.log(\'check_path_script\',\'found\')\n
+  if message is not None:\n
+    raise ValidationFailed, (message,)\n
   \n
 resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
 \n

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/empty.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>global</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Empty Classification Survey (%(count)s)</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+Base_viewWorklist?simulation_state=empty&portal_type=Classification Survey&reset=1
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Empty Classification Survey</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>empty</string> </value>
+        </item>
+        <item>
+            <key> <string>var_matches</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+                <string>Assistant</string>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Classification Survey</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>simulation_state</string> </key>
+                    <value>
+                      <tuple>
+                        <string>empty</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/ordered.xml

@@ -27,7 +27,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Usual Cash Rendering
+Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Usual Cash Rendering
 
 ]]></string> </value>
         </item>
@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Usual Cash Render
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Usual Cash Render
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>

bt5/erp5_banking_cash/bt/revision

-503
\ No newline at end of file
+504
\ No newline at end of file