diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml index 35abab7cf8b37e3b4d92134197d8f21e66c676f1..5a84272589a05e1163f54472d3caef9e3dd0c2ad 100755 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml @@ -140,6 +140,12 @@ <dictionary/> </value> </item> + <item> + <key> <string>getSubVariationText</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>isAccountable</string> </key> <value> @@ -186,6 +192,7 @@ <string>isAccountable</string> <string>getPortalType</string> <string>getVariationText</string> +<string>getSubVariationText</string> </list> </value> </item> @@ -222,7 +229,8 @@ getStartDate\r\n getStopDate\r\n isAccountable\r\n getPortalType\r\n -getVariationText</string> </value> +getVariationText\r\n +getSubVariationText</string> </value> </item> <item> <key> <string>cache_time_</string> </key> @@ -293,6 +301,7 @@ WHERE\n , getPortalType[loop_item]\n , getSimulationState[loop_item]\n , getVariationText[loop_item]\n + , getSubVariationText[loop_item]\n ])">\n </dtml-if>\n <dtml-if "getBaobabSourceUid[loop_item]">\n @@ -312,6 +321,7 @@ WHERE\n , getPortalType[loop_item]\n , getSimulationState[loop_item]\n , getVariationText[loop_item]\n + , getSubVariationText[loop_item]\n ])">\n </dtml-if>\n </dtml-if>\n @@ -339,7 +349,8 @@ VALUES\n <dtml-sqlvar expr="row_item[12]" type="int" optional>,\n <dtml-sqlvar expr="row_item[13]" type="string" optional>,\n <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n - <dtml-sqlvar expr="row_item[15]" type="string" optional>\n + <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[16]" type="string" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n @@ -414,6 +425,7 @@ WHERE\n , getPortalType[loop_item]\n , getSimulationState[loop_item]\n , getVariationText[loop_item]\n + , getSubVariationText[loop_item]\n ])">\n </dtml-if>\n <dtml-if "getBaobabSourceUid[loop_item]">\n @@ -433,6 +445,7 @@ WHERE\n , getPortalType[loop_item]\n , getSimulationState[loop_item]\n , getVariationText[loop_item]\n + , getSubVariationText[loop_item]\n ])">\n </dtml-if>\n </dtml-if>\n @@ -460,7 +473,8 @@ VALUES\n <dtml-sqlvar expr="row_item[12]" type="int" optional>,\n <dtml-sqlvar expr="row_item[13]" type="string" optional>,\n <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n - <dtml-sqlvar expr="row_item[15]" type="string" optional>\n + <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[16]" type="string" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log index 6ce5045814ffd62a11f4f7570268b7579ff200d5..363264a48ecbe5295faf27567f51bd8606ed9767 100755 --- a/bt5/erp5_banking_core/bt/change_log +++ b/bt5/erp5_banking_core/bt/change_log @@ -1,3 +1,7 @@ +2006-01-09 aurel +* Update z_catalog_stock_list +* Remove base category function, group, site which are in erp5_core + 2005-12-19 Kevin * Update z_catalog_stock_list ZSQL method to follow Seb's changes. * Add Baobab_getPortalReferenceCurrencyID script to get the default currency. diff --git a/bt5/erp5_banking_core/bt/template_base_category_list b/bt5/erp5_banking_core/bt/template_base_category_list index 5c8cae03d88e97965f27701c93edb5d28adc83a3..7ad68ae93e43d92edcf11bb3cb4d6a4c29db78c2 100755 --- a/bt5/erp5_banking_core/bt/template_base_category_list +++ b/bt5/erp5_banking_core/bt/template_base_category_list @@ -1,7 +1,4 @@ cash_status emission_letter -function -group -site variation vault_type \ No newline at end of file