From de527365a8bc4dc6cd4966d2981eadb7d8ef8ebc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Wed, 2 Jul 2014 20:10:44 +0200 Subject: [PATCH] Fix: [ bug #1517 ] Packages sizes --- htdocs/install/mysql/migration/3.5.0-3.6.0.sql | 11 ++++++++++- htdocs/install/mysql/tables/llx_expedition.sql | 10 +++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql index e9d24685027..b3d71fe5af7 100644 --- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql +++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql @@ -18,6 +18,15 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); + + + +ALTER TABLE llx_expedition MODIFY COLUMN height float; +ALTER TABLE llx_expedition MODIFY COLUMN width float; +ALTER TABLE llx_expedition MODIFY COLUMN size float; +ALTER TABLE llx_expedition MODIFY COLUMN weight float; + + ALTER TABLE llx_societe DROP COLUMN datea; ALTER TABLE llx_holiday ADD COLUMN fk_user_create integer; @@ -1663,4 +1672,4 @@ INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, -- Fix: Missing instruction not correctly done into 3.5 -- VPGSQL8.2 ALTER TABLE llx_facture_fourn ALTER fk_mode_reglement DROP NOT NULL; -- VPGSQL8.2 ALTER TABLE llx_facture_fourn ALTER fk_cond_reglement DROP NOT NULL; - + \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 08ea9683281..0a152b13069 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -41,13 +41,13 @@ create table llx_expedition fk_shipping_method integer, tracking_number varchar(50), fk_statut smallint DEFAULT 0, - - height integer, -- height - width integer, -- with + + height float, -- height + width float, -- with size_units integer, -- unit of all sizes (height, width, depth) - size integer, -- depth + size float, -- depth weight_units integer, -- unit of weight - weight integer, -- weight + weight float, -- weight note_private text, note_public text, model_pdf varchar(255) -- GitLab