[Erp5-report] r16308 - in /erp5/trunk/bt5/erp5_banking_check: ActionTemplateItem/portal_typ...

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Sep 12 17:57:21 CEST 2007


Author: seb
Date: Wed Sep 12 17:57:20 2007
New Revision: 16308

URL: http://svn.erp5.org?rev=16308&view=rev
Log:
modified checkbook reception so that if we do an import we will confirm checks and checkbooks

Added:
    erp5/trunk/bt5/erp5_banking_check/PropertySheetTemplateItem/CheckbookReception.py
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml
Modified:
    erp5/trunk/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml
    erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
    erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
    erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%20Reception.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision
    erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list
    erp5/trunk/bt5/erp5_banking_check/bt/template_property_sheet_id_list

Modified: erp5/trunk/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%2520Reception/fastInput.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml Wed Sep 12 17:57:20 2007
@@ -95,7 +95,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\')</string> </value>
+            <value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\') and not object.isImport()</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py (original)
+++ erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py Wed Sep 12 17:57:20 2007
@@ -18,6 +18,7 @@
     check_quantity = str(item.xpath("string(./check_quantity)"))
     reference_min = str(item.xpath("string(./reference_min)"))
     reference_max = str(item.xpath("string(./reference_max)"))
+    quantity = str(item.xpath("string(./quantity)"))
     internal_account_number = item.xpath("string(./numero_interne)")
     checkbook_type = item.xpath("string(./checkbook_type)")
     type = str(item.xpath("string(./checkbook_type)"))
@@ -28,6 +29,7 @@
     item_dict['reference_min'] = reference_min
     item_dict['reference_max'] = reference_max
     item_dict['check_quantity'] = check_quantity
+    item_dict['quantity'] = quantity
     item_dict['internal_account_number'] = internal_account_number
 
   listbox_dict = {}
@@ -57,7 +59,8 @@
         listbox_line['reference_range_min'] = item_dict['reference_min']
         listbox_line['reference_range_max'] = item_dict['reference_max']
         listbox_line['destination_payment_reference'] = item_dict['internal_account_number']
-        listbox_line['quantity'] = 1
+        #listbox_line['quantity'] = 1
+        listbox_line['quantity'] = item_dict['quantity']
         if is_checkbook:
           listbox_line['check_amount'] = resource_amount_dict[item_dict['check_quantity']]
         listbox.append(listbox_line)
@@ -88,6 +91,7 @@
                                          REQUEST=REQUEST)
 
     message = Message(domain='ui', message='File Imported successfully')
+    self.setImported(1)
   return message
 
 

Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml Wed Sep 12 17:57:20 2007
@@ -14,6 +14,9 @@
  <portal_type id="Checkbook Movement">
   <item>Amount</item>
   <item>Price</item>
+ </portal_type>
+ <portal_type id="Checkbook Reception">
+  <item>CheckbookReception</item>
  </portal_type>
  <portal_type id="Checkbook Usual Cash Transfer">
   <item>Price</item>

Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%20Reception.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%2520Reception.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%20Reception.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%20Reception.xml Wed Sep 12 17:57:20 2007
@@ -100,6 +100,10 @@
             <value> <string>CheckbookReception_init</string> </value>
         </item>
         <item>
+            <key> <string>permission</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
               <tuple/>

Added: erp5/trunk/bt5/erp5_banking_check/PropertySheetTemplateItem/CheckbookReception.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PropertySheetTemplateItem/CheckbookReception.py?rev=16308&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PropertySheetTemplateItem/CheckbookReception.py (added)
+++ erp5/trunk/bt5/erp5_banking_check/PropertySheetTemplateItem/CheckbookReception.py Wed Sep 12 17:57:20 2007
@@ -1,0 +1,39 @@
+##############################################################################
+#
+# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+class CheckbookReception:
+  """
+      Properties for Baobab Bank Account Objects
+  """
+
+  _properties = (
+    {'id'          : 'imported',
+     'description' : 'Indicate if this document is used for an import',
+     'type'        : 'boolean',
+     'mode'        : 'w'
+    },
+    )

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml Wed Sep 12 17:57:20 2007
@@ -173,9 +173,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
@@ -273,11 +271,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -289,23 +284,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: None</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml Wed Sep 12 17:57:20 2007
@@ -335,7 +335,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: ((request.get(\'resource\', False)) and (None, ) or (\'Type\', ))[0]</string> </value>
+            <value> <string>python: ((request.get(\'resource\', \'\')) and (\'\', ) or (\'Type\', ))[0]</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml Wed Sep 12 17:57:20 2007
@@ -273,18 +273,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site/surface/caisse_courante\',\'site/surface/banque_interne/guichet\',\'site/surface/operations_diverses/guichet\'),leaf_node=0,first_level=1)</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site/surface/caisse_courante\',\'site/surface/banque_interne/guichet\',\'site/surface/operations_diverses/guichet\'),leaf_node=0,first_level=1,current_url=here.getSource())</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml Wed Sep 12 17:57:20 2007
@@ -233,6 +233,8 @@
       item.setTitle(\'%s - %s\' % (reference_range_min, reference_range_max))\n
       item.setCheckAmount(check_amount)\n
       destination_section = item.getDestinationSection()\n
+      if confirm_check:\n
+        item.confirm()\n
       for j in reference_list:\n
         #tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, j)\n
         #encountered_check_identifiers_dict[tag] = None\n
@@ -241,6 +243,8 @@
         check.setStartDate(start_date)\n
         check.setReference(j)\n
         check.setResource(model)\n
+        if confirm_check:\n
+          check.confirm()\n
   else:\n
     last_reference_value = reference_to_int(reference_range_min)\n
     if check == 1:\n
@@ -253,6 +257,9 @@
         item_type = line.getCheckTypeValue()\n
         item.setPrice(item_type.getPrice())\n
         item.setPriceCurrency(line.getPriceCurrency())\n
+      if confirm_check:\n
+        item.setStartDate(start_date)\n
+        item.confirm()\n
       #tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, reference_range_min)\n
       #encountered_check_identifiers_dict[tag] = None\n
   # update reference_range_min for the next pass\n
@@ -293,7 +300,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>check=0, create=0, tag=None, encountered_check_identifiers_dict=None</string> </value>
+            <value> <string>check=0, create=0, tag=None, confirm_check=0, encountered_check_identifiers_dict=None</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
@@ -321,7 +328,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>4</int> </value>
+                        <value> <int>5</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -330,6 +337,7 @@
                             <string>check</string>
                             <string>create</string>
                             <string>tag</string>
+                            <string>confirm_check</string>
                             <string>encountered_check_identifiers_dict</string>
                             <string>Products.DCWorkflow.DCWorkflow</string>
                             <string>ValidationFailed</string>
@@ -401,6 +409,7 @@
                 <int>0</int>
                 <int>0</int>
                 <none/>
+                <int>0</int>
                 <none/>
               </tuple>
             </value>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml Wed Sep 12 17:57:20 2007
@@ -97,7 +97,7 @@
 if create==1:\n
   for line in line_list:\n
     line.activate(tag=checkbook_reception_tag).\\\n
-        CheckbookReceptionLine_checkOrCreateItemList(create=1, tag=checkbook_reception_tag)\n
+        CheckbookReceptionLine_checkOrCreateItemList(create=1, tag=checkbook_reception_tag, confirm_check=confirm_check)\n
 </string> </value>
         </item>
         <item>
@@ -120,7 +120,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>check=0, create=0</string> </value>
+            <value> <string>check=0, create=0, confirm_check=0</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -140,7 +140,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -148,6 +148,7 @@
                           <tuple>
                             <string>check</string>
                             <string>create</string>
+                            <string>confirm_check</string>
                             <string>Products.DCWorkflow.DCWorkflow</string>
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
@@ -176,6 +177,7 @@
               <tuple>
                 <int>0</int>
                 <int>0</int>
+                <int>0</int>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml Wed Sep 12 17:57:20 2007
@@ -65,9 +65,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>destination = context.getDestination()\n
-if destination is not None:\n
-  destination += \'/caveau/auxiliaire/encaisse_des_billets_et_monnaies\'\n
+            <value> <string>destination = None\n
+# if import, then set destination to None\n
+if not context.isImport():\n
+  destination = context.getDestination()\n
+  if destination is not None:\n
+    destination += \'/caveau/auxiliaire/encaisse_des_billets_et_monnaies\'\n
 \n
 return destination\n
 </string> </value>
@@ -120,10 +123,11 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>None</string>
+                            <string>destination</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>destination</string>
-                            <string>None</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml Wed Sep 12 17:57:20 2007
@@ -104,6 +104,7 @@
                       <list>
                         <string>my_source_reference</string>
                         <string>my_destination</string>
+                        <string>my_imported</string>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml Wed Sep 12 17:57:20 2007
@@ -273,18 +273,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = None, user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = here.getDestination(), user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value>
         </item>
       </dictionary>
     </pickle>

Added: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml?rev=16308&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml (added)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml Wed Sep 12 17:57:20 2007
@@ -1,0 +1,166 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="LabelField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_imported</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Imported File</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.isImported() and 1 or 0</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml Wed Sep 12 17:57:20 2007
@@ -273,18 +273,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(), vault_type=(\'site/caveau\',\'site/surface\',),strict_membership=1,leaf_node=0)</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/caveau\',\'site/surface\',),strict_membership=1,leaf_node=0)</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml Wed Sep 12 17:57:20 2007
@@ -38,7 +38,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -64,29 +64,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-                <string>Assignee</string>
-                <string>DestinationAssignee</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml Wed Sep 12 17:57:20 2007
@@ -38,7 +38,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -64,29 +64,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-                <string>Assignor</string>
-                <string>Assignee</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml Wed Sep 12 17:57:20 2007
@@ -67,11 +67,8 @@
   <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,7 +78,6 @@
             <value>
               <tuple>
                 <string>Manager</string>
-                <string>Assignor</string>
                 <string>Assignee</string>
               </tuple>
             </value>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml Wed Sep 12 17:57:20 2007
@@ -38,7 +38,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -64,28 +64,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-                <string>DestinationAssignee</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml Wed Sep 12 17:57:20 2007
@@ -67,11 +67,8 @@
   <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>
@@ -82,7 +79,6 @@
               <tuple>
                 <string>Manager</string>
                 <string>Assignee</string>
-                <string>Assignor</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml Wed Sep 12 17:57:20 2007
@@ -67,11 +67,8 @@
   <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>
@@ -82,7 +79,6 @@
               <tuple>
                 <string>Manager</string>
                 <string>Assignee</string>
-                <string>Assignor</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml Wed Sep 12 17:57:20 2007
@@ -38,7 +38,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -64,29 +64,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-                <string>Assignor</string>
-                <string>Assignee</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml Wed Sep 12 17:57:20 2007
@@ -67,11 +67,8 @@
   <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>
@@ -82,7 +79,6 @@
               <tuple>
                 <string>Manager</string>
                 <string>Assignor</string>
-                <string>Assignee</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml Wed Sep 12 17:57:20 2007
@@ -81,6 +81,7 @@
   for aggregate in aggregate_list:\n
     if aggregate.getPortalType()==\'Checkbook\':\n
       aggregate.setStartDate(transaction.getStartDate())\n
+      aggregate.confirm()\n
       for check in aggregate.objectValues(portal_type=\'Check\'):\n
         check.confirm()\n
         check.setStartDate(transaction.getStartDate())\n

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml Wed Sep 12 17:57:20 2007
@@ -79,8 +79,9 @@
 transaction.CheckbookReception_checkOrCreateItemList(check=1)\n
 \n
 # Start activities for each line\n
-transaction.CheckbookReception_checkOrCreateItemList(create=1)\n
-\n
+confirm_check = transaction.isImported()\n
+transaction.CheckbookReception_checkOrCreateItemList(create=1,\n
+                      confirm_check=confirm_check)\n
 \n
 \n
 #from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
@@ -320,6 +321,7 @@
                             <string>_getitem_</string>
                             <string>transaction</string>
                             <string>_getattr_</string>
+                            <string>confirm_check</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml Wed Sep 12 17:57:20 2007
@@ -36,7 +36,10 @@
         <item>
             <key> <string>transitions</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>delete</string>
+                <string>delete_action</string>
+              </tuple>
             </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml Wed Sep 12 17:57:20 2007
@@ -57,11 +57,8 @@
   <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 @@
   <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>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml Wed Sep 12 17:57:20 2007
@@ -57,11 +57,8 @@
   <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 @@
   <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>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Wed Sep 12 17:57:20 2007
@@ -1,1 +1,1 @@
-318
+320

Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list Wed Sep 12 17:57:20 2007
@@ -6,6 +6,7 @@
 Checkbook Delivery | Price
 Checkbook Movement | Amount
 Checkbook Movement | Price
+Checkbook Reception | CheckbookReception
 Checkbook Usual Cash Transfer | Amount
 Checkbook Usual Cash Transfer | Price
 Checkbook Vault Transfer | Amount

Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_property_sheet_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_property_sheet_id_list?rev=16308&r1=16307&r2=16308&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_property_sheet_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_property_sheet_id_list Wed Sep 12 17:57:20 2007
@@ -1,1 +1,2 @@
-StopPayment
+StopPayment
+CheckbookReception




More information about the Erp5-report mailing list