lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: forgotten two tables in the migration script

Browse Source
This commit is contained in:
Regis Houssin 2009-07-29 15:02:29 +00:00
parent 59095f8749
commit 5fe7b641d1
2 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/product/canvas/product.livre.class.php
View File

@ -533,27 +533,27 @@ class ProductLivre extends Product
$i = 0; $i = 0;
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$datas = array(); $datas = array();
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$datas["id"] = $obj->rowid; $datas["id"] = $obj->rowid;
$datas["ref"] = $obj->ref; $datas["ref"] = $obj->ref;
$datas["titre"] = $obj->label; $datas["titre"] = $obj->label;
$datas["casier"] = $obj->casier; $datas["casier"] = $obj->casier;
$datas["entrepot"] = $obj->entrepot; $datas["entrepot"] = $obj->entrepot;
$datas["ventes"] = $obj->ventes; $datas["ventes"] = $obj->ventes;
$datas["stock"] = 0; $datas["stock"] = 0;
$datas["stock_loc"] = stripslashes($obj->stock_loc); $datas["stock_loc"] = stripslashes($obj->stock_loc);
$datas["pages"] = $obj->pages; $datas["pages"] = $obj->pages;
$datas["prix"] = price($obj->price); $datas["prix"] = price($obj->price);
$datas["valo"] = 0; $datas["valo"] = 0;
array_push($this->list_datas,$datas); array_push($this->list_datas,$datas);
$i++; $i++;
} }
$this->db->free($resql); $this->db->free($resql);
} }
else else
{ {
@ -604,7 +604,5 @@ class ProductLivre extends Product
return 0; return 0;
} }
} }
?> ?>

31
mysql/migration/2.6.0-2.7.0.sql
View File

@ -24,6 +24,37 @@ create table llx_import_model
field text NOT NULL field text NOT NULL
)type=innodb; )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)'; 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); ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);