diff --git a/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index 695a291ae294ac6ffb504ff442fd2d427454c831..d4626c2c5b36c0fe0b9e24c1090fd16325c3d3fe 100644 --- a/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/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"> diff --git a/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml b/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml index e72b14b1c03e2bf553c45075fc335f6804d8681b..2bd6387357cd8c33a4511c0c5c784de6ef7d6bd3 100644 --- a/bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Check%20Payment.xml +++ b/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> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml index 94193e3531b7b434b4c7b844497348fa257aee9a..0dea306ee37192306c13789d642f3358205ec00c 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml +++ b/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> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index e99fdcc524490dab1572edae62443278a789b5e9..1199cd493e5b0f7c20b1040406896a3f2004c700 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -217 \ No newline at end of file +219 \ No newline at end of file diff --git a/bt5/erp5_banking_check/bt/template_portal_type_base_category_list b/bt5/erp5_banking_check/bt/template_portal_type_base_category_list index af19a5e6747d2bee32acd8ce72e0a6f4e671f4c2..3ba33bc617c29f8e38e903b72a9d41dd5336d035 100644 --- a/bt5/erp5_banking_check/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_check/bt/template_portal_type_base_category_list @@ -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