moved has_cell_content from movement to catalog

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

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>,

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`),

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`),

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>