accounting transaction with categories are no longer considered as valid.

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

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml

@@ -87,24 +87,17 @@ if transition.id in (\'plan_action\', \'confirm_action\') :\n
   skip_period_validation = 1\n
 \n
 # do we have to care about destination section ?\n
-check_destination = (transaction.getPortalType() in transaction.getPortalInvoiceTypeList())\n
+check_destination = (transaction.getPortalType() in\n
+                     transaction.getPortalInvoiceTypeList())\n
 \n
 # Get sections and a currency.\n
 source_section = transaction.getSourceSectionValue(\n
-            portal_type = [\'Organisation\', \'Person\', \'Category\'])\n
-if source_section is not None and \\\n
-            source_section.getPortalType() == \'Category\' :\n
-  source_section = source_section.getMappingRelatedValue(\n
-            portal_type = \'Organisation\')\n
+                       portal_type=[\'Organisation\', \'Person\'])\n
 if source_section is None:\n
   raise ValidationFailed(\'Source Section is not Defined.\')\n
 \n
 destination_section = transaction.getDestinationSectionValue(\n
-       portal_type = [\'Organisation\', \'Person\', \'Category\'])\n
-if destination_section is not None and \\\n
-       destination_section.getPortalType() == \'Category\' :\n
-  destination_section = destination_section.getMappingRelatedValue(\n
-            portal_type = \'Organisation\')\n
+                portal_type=[\'Organisation\', \'Person\'])\n
 # if it\'s not an invoice, then we can validate without destination\n
 if destination_section is None and check_destination :\n
   raise ValidationFailed(\'Destination Section is not Defined.\')\n

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.xml

@@ -76,6 +76,8 @@ from Products.ERP5Type.Message import Message\n
 \n
 SOURCE, DESTINATION = (\'source\', \'destination\')\n
 transaction = state_change[\'object\']\n
+portal = transaction.getPortalObject()\n
+valid_section_portal_type_list = [\'Person\', \'Organisation\']\n
 N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
 \n
 # first of all, validate the transaction itself\n
@@ -83,9 +85,9 @@ container.validateTransaction(state_change)\n
 \n
 # Get sections.\n
 source_section = transaction.getSourceSectionValue(\n
-                        portal_type=[\'Person\', \'Organisation\'])\n
+                           portal_type=valid_section_portal_type_list)\n
 destination_section = transaction.getDestinationSectionValue(\n
-                        portal_type=[\'Person\', \'Organisation\'])\n
+                           portal_type=valid_section_portal_type_list)\n
 \n
 # do we want to check validity for destination as well?\n
 check_for_destination = 0\n
@@ -131,12 +133,16 @@ if transaction.getPortalType() not in (\'Balance Transaction\',) :\n
     for side in (SOURCE, DESTINATION) :\n
       if side == SOURCE:\n
         account = transaction_line.getSourceValue(portal_type=\'Account\')\n
-        payment          = transaction_line.getSourcePaymentValue()\n
-        third_party      = transaction_line.getDestinationSectionValue()\n
+        payment = transaction_line.getSourcePaymentValue(\n
+                           portal_type=portal.getPortalPaymentNodeTypeList())\n
+        third_party = transaction_line.getDestinationSectionValue(\n
+                           portal_type=valid_section_portal_type_list)\n
       else:\n
         account = transaction_line.getDestinationValue(portal_type=\'Account\')\n
-        payment          = transaction_line.getDestinationPaymentValue()\n
-        third_party      = transaction_line.getSourceSectionValue()\n
+        payment = transaction_line.getDestinationPaymentValue(\n
+                           portal_type=portal.getPortalPaymentNodeTypeList())\n
+        third_party = transaction_line.getSourceSectionValue(\n
+                           portal_type=valid_section_portal_type_list)\n
 \n
       if account is None:\n
         continue\n
@@ -304,8 +310,10 @@ transaction.AccountingTransaction_deleteEmptyLines(redirect=0)\n
                             <string>DESTINATION</string>
                             <string>_getitem_</string>
                             <string>transaction</string>
-                            <string>N_</string>
                             <string>_getattr_</string>
+                            <string>portal</string>
+                            <string>valid_section_portal_type_list</string>
+                            <string>N_</string>
                             <string>container</string>
                             <string>source_section</string>
                             <string>destination_section</string>

bt5/erp5_accounting/bt/revision

-41
+46
\ No newline at end of file

product/ERP5/tests/testAccounting.py

@@ -1303,6 +1303,20 @@ class TestAccounting(ERP5TypeTestCase):
       stepValidateRemoveEmptyLines
     """, quiet=quiet)
 
+  def test_AccountingTransactionValidationRefusedWithCategoriesAsSections(self,
+                                        quiet=QUIET, run=RUN_ALL_TESTS):
+    """Validating a transaction with categories as sections is refused.
+    See http://wiki.erp5.org/Discussion/AccountingProblems """
+    category = self.vendor.getGroupValue()
+    self.assertNotEquals(category, None)
+    transaction = self.createAccountingTransaction(
+                                    source_section_value=category)
+    self.assertRaises(ValidationFailed, self.getWorkflowTool().doActionFor,
+                      transaction, 'stop_action')
+    transaction = self.createAccountingTransaction(
+                                    destination_section_value=category)
+    self.assertRaises(ValidationFailed, self.getWorkflowTool().doActionFor,
+                      transaction, 'stop_action')
 
 if __name__ == '__main__':
   framework()