slapos_accounting: No need trade condition for manual accounting

  The trade condition is only mandatory for automated invoices, if the accountant does things manually, it is
  not required to create/use one.

master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSaleInvoiceTransactionConstraint/sale_invoice_specialise_sale_trade_condition_constraint_constraint.xml

@@ -40,12 +40,24 @@
             <key> <string>id</string> </key>
             <value> <string>sale_invoice_specialise_sale_trade_condition_constraint_constraint</string> </value>
         </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>max_arity</string> </key>
             <value>
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>min_arity</string> </key>
             <value> <int>1</int> </value>
@@ -54,6 +66,22 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Category Membership Arity Constraint</string> </value>
         </item>
+        <item>
+            <key> <string>string_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_tales_expression</string> </key>
+            <value> <string>python: context.getLedger() == \'automated\'</string> </value>
+        </item>
         <item>
             <key> <string>use_acquisition</string> </key>
             <value> <int>0</int> </value>

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingConstraint.py

@@ -134,6 +134,12 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
     setter = invoice.setSpecialise
     message = "Arity Error for Relation ['specialise'] and Type "\
         "('Sale Trade Condition',), arity is equal to 0 but should be at least 1"
+    self.assertNotIn(message, self.getMessageList(invoice))
+
+    invoice = self.portal.accounting_module.newContent(
+        portal_type='Sale Invoice Transaction',
+        ledger='automated')
+    setter = invoice.setSpecialise
     self.assertIn(message, self.getMessageList(invoice))
 
     sale_condition = self.portal.sale_trade_condition_module.newContent(
@@ -153,6 +159,11 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
         portal_type='Sale Invoice Transaction')
     message = "Arity Error for Relation ['specialise'] and Type " + \
       "('Sale Trade Condition',), arity is equal to 0 but should be at least 1"
+    self.assertNotIn(message, self.getMessageList(invoice))
+
+    invoice = self.portal.accounting_module.newContent(
+        portal_type='Sale Invoice Transaction',
+        ledger='automated')
     self.assertIn(message, self.getMessageList(invoice))
 
     sale_condition = self.portal.sale_trade_condition_module.newContent(

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5ManualAccountingScenario.py

@@ -405,20 +405,6 @@ class TestSlapOSManualAccountingScenario(TestSlapOSManualAccountingScenarioMixin
       accountant_person, accountant_organisation, bank_account, currency = \
         self.bootstrapManualAccountingTest()
 
-    # Create required trade condition for manual accounting.
-    self.login()
-    business_process_module = self.portal.business_process_module
-    trade_condition = self.portal.sale_trade_condition_module.newContent(
-      portal_type='Sale Trade Condition',
-      trade_condition_type='default',
-      reference='manual_accounting_for_%s' % accountant_person.getReference(),
-      specialise_value=business_process_module.slapos_manual_accounting_business_process
-    )
-    self.portal.portal_workflow.doActionFor(trade_condition, 'validate_action')
-    self.assertEqual(trade_condition.checkConsistency(), [])
-    self.tic()
-
-    self.login(accountant_person.getUserId())
 
     # Accountant can create one account for Remboursement of a customer
     account = self.portal.account_module.newContent(
@@ -453,8 +439,7 @@ class TestSlapOSManualAccountingScenario(TestSlapOSManualAccountingScenarioMixin
       resource_value=currency,
       price_currency_value=currency,
       destination_section_value=customer,
-      source_section_value=accountant_organisation,
-      specialise_value=trade_condition
+      source_section_value=accountant_organisation
     )
 
     total_amount = 9876.30