[Erp5-report] r14553 - in /erp5/trunk/bt5/erp5_banking_check: PortalTypeBaseCategoryTemplat...

[nobody at svn.erp5.org]

Author: seb
Date: Tue May 22 21:51:17 2007
New Revision: 14553

URL: http://svn.erp5.org?rev=14553&view=rev
Log:
give right parameters to Base_checkCheck script

Modified:
    erp5/trunk/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
    erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision
    erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_base_category_list

Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml?rev=14553&r1=14552&r2=14553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml Tue May 22 21:51:17 2007
@@ -1,13 +1,16 @@
 <base_category_list>
  <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_type</item>
   <item>check_amount</item>
-  <item>check_type</item>
   <item>currency_exchange_type</item>
  </portal_type>
  <portal_type id="Checkbook Reception Line">

Modified: erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%2520Payment.xml?rev=14553&r1=14552&r2=14553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml Tue May 22 21:51:17 2007
@@ -105,6 +105,10 @@
             <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>
               <tuple/>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml?rev=14553&r1=14552&r2=14553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml Tue May 22 21:51:17 2007
@@ -121,10 +121,16 @@
 \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 @@
                             <string>price</string>
                             <string>bank_account</string>
                             <string>check_number</string>
+                            <string>check_resource</string>
                             <string>context</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14553&r1=14552&r2=14553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue May 22 21:51:17 2007
@@ -1,1 +1,1 @@
-217
+219

Modified: erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_base_category_list?rev=14553&r1=14552&r2=14553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_base_category_list (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/template_portal_type_base_category_list Tue May 22 21:51:17 2007
@@ -1,4 +1,5 @@
 Check Deposit | site
+Check Payment | aggregate_resource
 Checkbook Delivery Line | check_amount
 Checkbook Delivery Line | check_type
 Checkbook Delivery Line | currency_exchange_type