always include catalog table

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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -319,11 +319,11 @@ SELECT\n
 \n
 \n
 FROM\n
-  <dtml-var stock_table_id>\n
+  catalog, <dtml-var stock_table_id>\n
   <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if>  \n
        JOIN catalog AS section ON (section.uid = <dtml-var stock_table_id>.section_uid)\n
 <dtml-in prefix="table" expr="from_table_list"> \n
-  <dtml-if expr="table_key != stock_table_id">\n
+  <dtml-if expr="table_key not in (\'catalog\', stock_table_id)">\n
   , <dtml-var table_item> AS <dtml-var table_key>\n
   </dtml-if>\n
 </dtml-in>\n
@@ -458,11 +458,11 @@ SELECT\n
 \n
 \n
 FROM\n
-  <dtml-var stock_table_id>\n
+  catalog, <dtml-var stock_table_id>\n
   <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if>  \n
        JOIN catalog AS section ON (section.uid = <dtml-var stock_table_id>.section_uid)\n
 <dtml-in prefix="table" expr="from_table_list"> \n
-  <dtml-if expr="table_key != stock_table_id">\n
+  <dtml-if expr="table_key not in (\'catalog\', stock_table_id)">\n
   , <dtml-var table_item> AS <dtml-var table_key>\n
   </dtml-if>\n
 </dtml-in>\n

product/ERP5/bootstrap/erp5_core/bt/revision

-1358
+1359
\ No newline at end of file