diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql index 5fbc268870f256e0b9b42337ed57e0c929c67873..9da6536e17a153f58dd11700f266c8de1dcf8a44 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql @@ -22,7 +22,6 @@ getTargetStopDate getPrice getTotalPrice getTargetTotalPrice -hasCellContent isAccountable isOrderable isDeliverable @@ -45,7 +44,6 @@ INSERT INTO movement VALUES ( <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>, - <dtml-if "hasCellContent is not None"><dtml-sqlvar hasCellContent type="int"><dtml-else>NULL</dtml-if>, <dtml-if "isAccountable is not None"><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>, <dtml-if "isOrderable is not None"><dtml-sqlvar isOrderable type="int"><dtml-else>NULL</dtml-if>, <dtml-if "isDeliverable is not None"><dtml-sqlvar isDeliverable type="int"><dtml-else>NULL</dtml-if>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql index 4bc53cd3da26bb2900632c12644f9fb04291ddc1..f771e21ec0185f9fb5c341990fadea0054b4860b 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql @@ -48,6 +48,7 @@ CREATE TABLE `catalog` ( `string_index` varchar(255), `int_index` INT, `float_index` real, + `has_cell_content` tinyint(1) default '0', PRIMARY KEY (`uid`), KEY `security_uid` (`security_uid`), KEY `Parent` (`parent_uid`), diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql index 4588edcf57de23cb3259dcf012ce4867ce40e910..69638053680431a5479132943566547726a151f2 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql @@ -28,7 +28,6 @@ CREATE TABLE `movement` ( `price` real, `total_price` real, `target_total_price` real, - `has_cell_content` bool, `is_accountable` bool, `is_orderable` bool, `is_deliverable` bool, @@ -39,7 +38,6 @@ CREATE TABLE `movement` ( KEY `source_uid` (`source_uid`), KEY `destination_uid` (`destination_uid`), KEY `resource_uid` (`resource_uid`), - KEY `has_cell_content` (`has_cell_content`), KEY `is_accountable` (`is_accountable`), KEY `is_orderable` (`is_orderable`), KEY `is_deliverable` (`is_deliverable`), diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql index 8e193406acfb6d151287788abb843931ddb775f1..eb26cb0c8742afbf069b0a2d741992c5504997c6 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql @@ -42,7 +42,8 @@ getDestinationReference getStringIndex getIntIndex getFloatIndex -insert_catalog_line</params> +insert_catalog_line +hasCellContent</params> <dtml-if insert_catalog_line> INSERT INTO catalog(uid) VALUES (<dtml-sqlvar uid type="int">); @@ -83,5 +84,6 @@ UPDATE catalog SET uid=<dtml-sqlvar uid type="int">, destination_reference=<dtml-sqlvar getDestinationReference type="string" optional>, string_index=<dtml-sqlvar getStringIndex type="string" optional>, int_index=<dtml-sqlvar getIntIndex type="int" optional>, - float_index=<dtml-sqlvar getFloatIndex type="float" optional> + float_index=<dtml-sqlvar getFloatIndex type="float" optional>, + has_cell_content=<dtml-sqlvar hasCellContent type="int" optional> WHERE <dtml-sqltest uid op=eq type=int>