diff --git a/htdocs/product/canvas/product.livre.class.php b/htdocs/product/canvas/product.livre.class.php index 0f85280892b..d61e277637b 100644 --- a/htdocs/product/canvas/product.livre.class.php +++ b/htdocs/product/canvas/product.livre.class.php @@ -533,27 +533,27 @@ class ProductLivre extends Product $i = 0; while ($i < min($num,$limit)) - { - $datas = array(); - $obj = $this->db->fetch_object($resql); - - $datas["id"] = $obj->rowid; - $datas["ref"] = $obj->ref; - $datas["titre"] = $obj->label; - $datas["casier"] = $obj->casier; - $datas["entrepot"] = $obj->entrepot; - $datas["ventes"] = $obj->ventes; - $datas["stock"] = 0; - $datas["stock_loc"] = stripslashes($obj->stock_loc); - $datas["pages"] = $obj->pages; - $datas["prix"] = price($obj->price); - $datas["valo"] = 0; - - array_push($this->list_datas,$datas); - - $i++; - } - $this->db->free($resql); + { + $datas = array(); + $obj = $this->db->fetch_object($resql); + + $datas["id"] = $obj->rowid; + $datas["ref"] = $obj->ref; + $datas["titre"] = $obj->label; + $datas["casier"] = $obj->casier; + $datas["entrepot"] = $obj->entrepot; + $datas["ventes"] = $obj->ventes; + $datas["stock"] = 0; + $datas["stock_loc"] = stripslashes($obj->stock_loc); + $datas["pages"] = $obj->pages; + $datas["prix"] = price($obj->price); + $datas["valo"] = 0; + + array_push($this->list_datas,$datas); + + $i++; + } + $this->db->free($resql); } else { @@ -604,7 +604,5 @@ class ProductLivre extends Product return 0; } - - } -?> +?> \ No newline at end of file diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql index 9d23e74a559..70ce5181943 100644 --- a/mysql/migration/2.6.0-2.7.0.sql +++ b/mysql/migration/2.6.0-2.7.0.sql @@ -24,6 +24,37 @@ create table llx_import_model field text NOT NULL )type=innodb; +-- 2 forgotten tables +create table llx_product_cnv_livre +( + rowid integer PRIMARY KEY, + isbn varchar(13), + ean varchar(13), + format varchar(7), + px_feuillet float(12,4), + px_reliure float(12,4), + px_couverture float(12,4), + px_revient float(12,4), + stock_loc varchar(5), + pages smallint UNSIGNED, + fk_couverture integer, + fk_contrat integer, + fk_auteur integer DEFAULT 0 +)type=innodb; + +create table llx_product_cnv_livre_contrat +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_cnv_livre integer, + quantite integer, + taux float(3,2), + date_app datetime, + duree varchar(50), + fk_user integer, + locked tinyint default 0 +)type=innodb; + + update llx_bank_url set type='banktransfert' where type='?' and label='(banktransfert)'; ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);