trade/accounting: fix "Trade Condition" column on accounting module

Rename this column from "Sale Trade Condition" to "Trade Condition", so
that it can be used also for purchase and internal trade conditions.

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml

@@ -208,7 +208,7 @@
                         </tuple>
                         <tuple>
                           <string>specialise_trade_condition_title</string>
-                          <string>Sale Trade Condition</string>
+                          <string>Trade Condition</string>
                         </tuple>
                         <tuple>
                           <string>source_title</string>
@@ -460,7 +460,7 @@
                         </tuple>
                         <tuple>
                           <string>specialise_trade_condition_title</string>
-                          <string>Sale Trade Condition</string>
+                          <string>Trade Condition</string>
                         </tuple>
                         <tuple>
                           <string>source_title</string>

bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testInvoice.py

@@ -43,10 +43,12 @@ from erp5.component.test.testPackingList import TestPackingListMixin
 from Products.ERP5.tests.utils import newSimulationExpectedFailure
 from erp5.component.module.TestInvoiceMixin import TestInvoiceMixin, TestSaleInvoiceMixin
 
+
 class TestInvoice(TestInvoiceMixin):
   """Test methods for sale and purchase invoice.
   Subclasses must defines portal types to use.
   """
+  trade_condition_portal_type = 'Sale Trade Condition'
   quiet = 1
   def test_invoice_transaction_line_resource(self):
     """
@@ -1462,8 +1464,8 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent(
     self._testSubContentReindexing(invoice, [invoice_line, transaction_line,
       invoice_cell])
 
-  def test_AccountingTransactionModuleListboxSaleTradeConditionColumn(self):
-    """Check listbox Sale Trade Condition column displays the trade condition
+  def test_AccountingTransactionModuleListboxTradeConditionColumn(self):
+    """Check listbox Trade Condition column displays the trade condition
     when there are multiple documents related by specialise category.
     """
     # test init
@@ -1471,10 +1473,10 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent(
     whatever_object = accounting_module.newContent(
       portal_type=self.invoice_portal_type,
     )
-    sale_trade_condition_title = "Sale Trade Condition from test_AccountingTransactionModuleListboxSaleTradeConditionColumn"
-    sale_trade_condition = self.portal.sale_trade_condition_module.newContent(
-      portal_type="Sale Trade Condition",
-      title=sale_trade_condition_title,
+    trade_condition_title = "Trade Condition from %s" % self.id()
+    trade_condition = self.portal.getDefaultModule(self.trade_condition_portal_type).newContent(
+      portal_type=self.trade_condition_portal_type,
+      title=trade_condition_title,
     )
     sale_invoice = accounting_module.newContent(
       portal_type=self.invoice_portal_type,
@@ -1484,15 +1486,15 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent(
     # Check listbox Sale Trade Condition column displays the trade condition
     # when there are multiple documents related by specialise category.
     accounting_listbox = accounting_module.AccountingTransactionModule_viewAccountingTransactionList.listbox
-    self.assertIn(("specialise_trade_condition_title", "Sale Trade Condition"), accounting_listbox.get_value("columns") + accounting_listbox.get_value("all_columns"))
+    self.assertIn(("specialise_trade_condition_title", "Trade Condition"), accounting_listbox.get_value("columns") + accounting_listbox.get_value("all_columns"))
     sale_invoice.setSpecialiseValueList([whatever_object])
     self.tic()
     sale_invoice_brain, = self.portal.portal_catalog(uid=sale_invoice.getUid(), select_list=["specialise_trade_condition_title"], limit=1)
     self.assertEqual(sale_invoice_brain.specialise_trade_condition_title, None)
-    sale_invoice.setSpecialiseValueList([whatever_object, sale_trade_condition])
+    sale_invoice.setSpecialiseValueList([whatever_object, trade_condition])
     self.tic()
     sale_invoice_brain, = self.portal.portal_catalog(uid=sale_invoice.getUid(), select_list=["specialise_trade_condition_title"], limit=1)
-    self.assertEqual(sale_invoice_brain.specialise_trade_condition_title, sale_trade_condition_title)
+    self.assertEqual(sale_invoice_brain.specialise_trade_condition_title, trade_condition_title)
 
 class TestSaleInvoice(TestSaleInvoiceMixin, TestInvoice, ERP5TypeTestCase):
   """Tests for sale invoice.
@@ -2580,6 +2582,7 @@ class TestPurchaseInvoice(TestInvoice, ERP5TypeTestCase):
   invoice_transaction_line_portal_type = 'Purchase Invoice Transaction Line'
   invoice_line_portal_type = 'Invoice Line'
   invoice_cell_portal_type = 'Invoice Cell'
+  trade_condition_portal_type = 'Purchase Trade Condition'
 
   # default sequence for one line of not varianted resource.
   PACKING_LIST_DEFAULT_SEQUENCE = """

bt5/erp5_trade/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_specialise_trade_condition.sql

 <dtml-var table_1>.uid = <dtml-var table_0>.category_uid
 AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">
-AND <dtml-var table_1>.portal_type = 'Sale Trade Condition'
+AND <dtml-var table_1>.portal_type in ('Sale Trade Condition', 'Purchase Trade Condition', 'Internal Trade Condition')
 <dtml-var RELATED_QUERY_SEPARATOR>
 <dtml-var table_0>.uid = <dtml-var query_table>.uid
\ No newline at end of file

bt5/erp5_trade/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_specialise_trade_condition.xml

@@ -2,21 +2,19 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-table_1\r\n
-RELATED_QUERY_SEPARATOR=" AND "\r\n
+            <value> <string>table_0\n
+table_1\n
+RELATED_QUERY_SEPARATOR=" AND "\n
 query_table="catalog"</string> </value>
         </item>
         <item>
@@ -25,11 +23,15 @@ query_table="catalog"</string> </value>
         </item>
         <item>
             <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
@@ -53,9 +55,13 @@ query_table="catalog"</string> </value>
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>z_related_specialise_trade_condition</string> </value>
         </item>
       </dictionary>
     </pickle>