2007-12-03 aurel

add possibility to select an accounting code on destination

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

bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_view.xml

@@ -109,6 +109,7 @@
                         <string>my_site</string>
                         <string>my_destination_payment_reference</string>
                         <string>my_destination_payment_title</string>
+                        <string>my_destination_section</string>
                         <string>my_source_total_asset_price</string>
                       </list>
                     </value>

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

@@ -77,6 +77,17 @@ site = transaction.getSite()\n
 date = transaction.getStartDate()\n
 transaction.Baobab_checkAccountingDateOpen(site=site, date=date)\n
 \n
+# Check we don\'t defined accounting code and account\n
+if transaction.getDestinationSection() not in ("", None) and \\\n
+       transaction.getDestinationPayment() not in ("", None):\n
+  msg = Message(domain=\'ui\', message="You can\'t defined both account and accounting code.")\n
+  raise ValidationFailed, (msg,)\n
+  \n
+if transaction.getDestinationSection() in ("", None) and \\\n
+       transaction.getDestinationPayment() in ("", None):\n
+  msg = Message(domain=\'ui\', message="You must defined an account or and accounting code as destination.")\n
+  raise ValidationFailed, (msg,)\n
+\n
 # Check the amount.\n
 price = transaction.getSourceTotalAssetPrice()\n
 if price is None or price <= 0:\n
@@ -85,12 +96,10 @@ if price is None or price <= 0:\n
 \n
 # Check the bank account.\n
 destination_bank_account = transaction.getDestinationPaymentValue()\n
-if destination_bank_account is None:\n
-  msg = Message(domain=\'ui\', message="Destination bank account not defined.")\n
-  raise ValidationFailed, (msg,)\n
-if destination_bank_account.getValidationState() != \'valid\':\n
-  msg = Message(domain=\'ui\', message=\'Destination bank account is not valid.\')\n
-  raise ValidationFailed, (msg,)\n
+if destination_bank_account is not None:\n
+  if destination_bank_account.getValidationState() != \'valid\':\n
+    msg = Message(domain=\'ui\', message=\'Destination bank account is not valid.\')\n
+    raise ValidationFailed, (msg,)\n
 \n
 # Check if the total price is equal to the total asset price.\n
 if transaction.getTotalPrice(portal_type = \'Check Operation Line\') != transaction.getSourceTotalAssetPrice():\n
@@ -238,9 +247,9 @@ if transaction.getSimulationState() == "draft":\n
                             <string>_getattr_</string>
                             <string>site</string>
                             <string>date</string>
-                            <string>price</string>
                             <string>None</string>
                             <string>msg</string>
+                            <string>price</string>
                             <string>destination_bank_account</string>
                             <string>_getiter_</string>
                             <string>check_operation_line</string>

bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/transitions/deliver_action.xml

@@ -27,7 +27,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Pay</string> </value>
+            <value> <string>Settle</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>

bt5/erp5_banking_check/bt/revision

-344
+345
\ No newline at end of file