give right parameters to Base_checkCheck script

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

bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml

@@ -2,12 +2,15 @@
  <portal_type id="Check Deposit">
   <item>site</item>
  </portal_type>
+ <portal_type id="Check Payment">
+  <item>aggregate_resource</item>
+ </portal_type>
  <portal_type id="Checkbook Delivery">
   <item>currency_exchange_type</item>
  </portal_type>
  <portal_type id="Checkbook Delivery Line">
-  <item>check_amount</item>
   <item>check_type</item>
+  <item>check_amount</item>
   <item>currency_exchange_type</item>
  </portal_type>
  <portal_type id="Checkbook Reception Line">

bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml

@@ -104,6 +104,10 @@
             <key> <string>init_script</string> </key>
             <value> <string>CheckPayment_init</string> </value>
         </item>
+        <item>
+            <key> <string>permission</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>

bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml

@@ -121,10 +121,16 @@ if bank_account is None:\n
 \n
 # Check the check.\n
 check_number = transaction.getAggregateFreeText()\n
+check_resource = transaction.getAggregateResource()\n
 if not check_number:\n
   msg = Message(domain=\'ui\', message="Check not defined.")\n
   raise ValidationFailed, (msg,)\n
-transaction.Base_checkCheck(reference=check_number, bank_account=bank_account)\n
+if check_resource is None:\n
+  msg = Message(domain=\'ui\', message="Check type not defined.")\n
+  raise ValidationFailed, (msg,)\n
+\n
+transaction.Base_checkCheck(reference=check_number, bank_account=bank_account, \n
+                            resource=check_resource)\n
 \n
 context.updateBankingOperation(state_change)\n
 
@@ -206,6 +212,7 @@ context.updateBankingOperation(state_change)\n
                             <string>price</string>
                             <string>bank_account</string>
                             <string>check_number</string>
+                            <string>check_resource</string>
                             <string>context</string>
                           </tuple>
                         </value>

bt5/erp5_banking_check/bt/revision

-217
+219
\ No newline at end of file

bt5/erp5_banking_check/bt/template_portal_type_base_category_list

 Check Deposit | site
+Check Payment | aggregate_resource
 Checkbook Delivery Line | check_amount
 Checkbook Delivery Line | check_type
 Checkbook Delivery Line | currency_exchange_type