Inventory API: omit_simulation can filter on stock.portal_type instead of catalog.portal_type

This way mysql will probably merge this with other constraints on
stock.portal_type when portal_type= is passed.

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

@@ -101,7 +101,7 @@ WHERE\n
 </dtml-if>\n
 \n
 <dtml-if omit_simulation>\n
-  AND catalog.portal_type != \'Simulation Movement\'\n
+  AND stock.portal_type != \'Simulation Movement\'\n
 </dtml-if>\n
 \n
 <dtml-if omit_input>\n

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

@@ -177,7 +177,7 @@ WHERE\n
 </dtml-if>\n
 \n
 <dtml-if omit_simulation>\n
-  AND catalog.portal_type != \'Simulation Movement\'\n
+  AND <dtml-var stock_table_id>.portal_type != \'Simulation Movement\'\n
 </dtml-if>\n
 <dtml-if only_accountable>\n
   AND <dtml-var stock_table_id>.is_accountable\n

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

@@ -528,7 +528,7 @@ WHERE\n
 </dtml-if>\n
 \n
 <dtml-if omit_simulation>\n
-  AND catalog.portal_type != \'Simulation Movement\'\n
+  AND stock.portal_type != \'Simulation Movement\'\n
 </dtml-if>\n
 <dtml-if only_accountable>\n
   AND stock.is_accountable\n