From 31b7546cb87ef6e3b5f2ceac75064b98594d9b36 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Sep 2010 14:38:06 +0000 Subject: [PATCH] Fix: Error in adding article --- htdocs/cashdesk/sql/llx_tmp_caisse.sql | 20 +++++++++---------- .../install/mysql/migration/2.8.0-2.9.0.sql | 9 ++++++++- .../install/mysql/migration/2.9.0-3.0.0.sql | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/htdocs/cashdesk/sql/llx_tmp_caisse.sql b/htdocs/cashdesk/sql/llx_tmp_caisse.sql index d6c65dc0ce1..589f92af5a9 100644 --- a/htdocs/cashdesk/sql/llx_tmp_caisse.sql +++ b/htdocs/cashdesk/sql/llx_tmp_caisse.sql @@ -5,14 +5,14 @@ -- Structure de la table `llx_tmp_caisse` -- -CREATE TABLE `llx_tmp_caisse` ( - `id` int(11) NOT NULL auto_increment, - `fk_article` tinyint(4) NOT NULL, - `qte` int(11) NOT NULL, - `fk_tva` int(11) NOT NULL, - `remise_percent` int(11) NOT NULL, - `remise` float NOT NULL, - `total_ht` float NOT NULL, - `total_ttc` float NOT NULL, - PRIMARY KEY (`id`) +CREATE TABLE llx_tmp_caisse ( + id integer NOT NULL auto_increment, + fk_article integer NOT NULL, + qte integer NOT NULL, + fk_tva integer NOT NULL, + remise_percent integer NOT NULL, + remise float NOT NULL, + total_ht float NOT NULL, + total_ttc float NOT NULL, + PRIMARY KEY (id) ) ENGINE=innodb; diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index 7c33d4d7503..8d99fb69045 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -312,7 +312,7 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, ' INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2313', 'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)', 1); -delete from llx_const where name='USER_PASSWORD_GENERATED' and value='default'; +DELETE from llx_const where name='USER_PASSWORD_GENERATED' and value='default'; ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; @@ -321,3 +321,10 @@ ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); -- Fix bad old data UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%'; + + +update llx_const set value ='eldy' where name = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon'); +update llx_user_param set value ='eldy' where param = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon'); + + +ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL; diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 6cd9c6b7e6d..70df4be62f7 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -52,4 +52,4 @@ ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_order integer; ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_invoice integer; -ALTER TABLE llx_tmp_caisse MODIFY fk_article int(11) NOT NULL; +ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL;