diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql index 6fda9998bed..ec6940e1441 100644 --- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql +++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql @@ -102,7 +102,7 @@ ALTER TABLE llx_c_type_fees ADD COLUMN type integer DEFAULT 0; ALTER TABLE llx_c_ecotaxe CHANGE COLUMN libelle label varchar(255); -ALTER TABLE llx_c_field_list ADD COLUMN checked tinyint DEFAULT 0 NOT NULL AFTER search; +ALTER TABLE llx_c_field_list ADD COLUMN visible tinyint DEFAULT 1 NOT NULL AFTER search; ALTER TABLE llx_product_fournisseur_price DROP COLUMN unitcharges; diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 17f8ef7356c..21adba42cfa 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -33,7 +33,7 @@ create table llx_c_field_list align varchar(6) DEFAULT 'left', -- align (left,center,right) sort tinyint DEFAULT 1 NOT NULL, -- add sort field search tinyint DEFAULT 0 NOT NULL, -- add search field - checked tinyint DEFAULT 0 NOT NULL, -- show or hide field by default + visible tinyint DEFAULT 1 NOT NULL, -- visibility of field. 0=Never visible, 1=Visible on list and forms, 2=Visible on list only enabled varchar(255) DEFAULT 1, -- Condition to show or hide rang integer DEFAULT 0 diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 1ea02816043..a6a182fc64f 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -253,7 +253,7 @@ class ActionsCardProduct $this->field_list = array(); - $sql = "SELECT rowid, name, alias, title, align, sort, search, checked, enabled, rang"; + $sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'"; $sql.= " AND entity = ".$conf->entity; @@ -278,7 +278,7 @@ class ActionsCardProduct $fieldlist["align"] = $obj->align; $fieldlist["sort"] = $obj->sort; $fieldlist["search"] = $obj->search; - $fieldlist["checked"] = $obj->checked; + $fieldlist["visible"] = $obj->visible; $fieldlist["enabled"] = verifCond($obj->enabled); $fieldlist["order"] = $obj->rang; diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 827360a7e9d..108c6ccb748 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -232,7 +232,7 @@ class ActionsCardService $this->field_list = array(); - $sql = "SELECT rowid, name, alias, title, align, sort, search, checked, enabled, rang"; + $sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'"; $sql.= " AND entity = ".$conf->entity; @@ -257,7 +257,7 @@ class ActionsCardService $fieldlist["align"] = $obj->align; $fieldlist["sort"] = $obj->sort; $fieldlist["search"] = $obj->search; - $fieldlist["checked"] = $obj->checked; + $fieldlist["visible"] = $obj->visible; $fieldlist["enabled"] = verifCond($obj->enabled); $fieldlist["order"] = $obj->rang;