From 9be80725d03b1e951aef3fb6a7a4056c95306449 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 4 Nov 2011 10:22:14 +0100 Subject: [PATCH] Fix: increase size of fields --- .../install/mysql/migration/3.1.0-3.2.0.sql | 39 ++++++++++------ htdocs/install/mysql/tables/llx_commande.sql | 38 ++++++++-------- htdocs/install/mysql/tables/llx_facture.sql | 44 +++++++++---------- htdocs/install/mysql/tables/llx_localtax.sql | 26 ++++------- htdocs/install/mysql/tables/llx_propal.sql | 10 ++--- 5 files changed, 81 insertions(+), 76 deletions(-) diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index d7b183c72ee..01b895d4c3c 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -71,17 +71,30 @@ DROP TABLE IF EXISTS llx_pos_tmp; ALTER TABLE llx_deplacement ADD COLUMN fk_user_modif integer AFTER fk_user_author; -CREATE TABLE IF NOT EXISTS `llx_localtax` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `datep` date DEFAULT NULL, - `datev` date DEFAULT NULL, - `amount` double NOT NULL DEFAULT '0', - `label` varchar(255) DEFAULT NULL, - `entity` int(11) NOT NULL DEFAULT '1', - `note` text, - `fk_bank` int(11) DEFAULT NULL, - `fk_user_creat` int(11) DEFAULT NULL, - `fk_user_modif` int(11) DEFAULT NULL, - PRIMARY KEY (`rowid`) +CREATE TABLE IF NOT EXISTS llx_localtax +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer NOT NULL DEFAULT '1', + tms timestamp, + datep date DEFAULT NULL, + datev date DEFAULT NULL, + amount double NOT NULL DEFAULT '0', + label varchar(255) DEFAULT NULL, + note text, + fk_bank integer DEFAULT NULL, + fk_user_creat integer DEFAULT NULL, + fk_user_modif integer DEFAULT NULL + ) ENGINE=InnoDB; + +ALTER TABLE llx_propal MODIFY ref_int varchar(255); +ALTER TABLE llx_propal MODIFY ref_ext varchar(255); +ALTER TABLE llx_propal MODIFY ref_client varchar(255); + +ALTER TABLE llx_commande MODIFY ref_int varchar(255); +ALTER TABLE llx_commande MODIFY ref_ext varchar(255); +ALTER TABLE llx_commande MODIFY ref_client varchar(255); + +ALTER TABLE llx_facture MODIFY ref_int varchar(255); +ALTER TABLE llx_facture MODIFY ref_ext varchar(255); +ALTER TABLE llx_facture MODIFY ref_client varchar(255); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index b99f5ce054a..0c972d3bc8d 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -21,24 +21,24 @@ create table llx_commande ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(30) NOT NULL, -- order reference number - entity integer DEFAULT 1 NOT NULL, -- multi company id + ref varchar(30) NOT NULL, -- order reference number + entity integer DEFAULT 1 NOT NULL, -- multi company id - ref_ext varchar(50), -- reference into an external system (not used by dolibarr) - ref_int varchar(50), -- reference into an internal system (used by dolibarr) - ref_client varchar(50), -- reference for customer + ref_ext varchar(255), -- reference into an external system (not used by dolibarr) + ref_int varchar(255), -- reference into an internal system (used by dolibarr) + ref_client varchar(255), -- reference for customer fk_soc integer NOT NULL, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande + fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande tms timestamp, - date_creation datetime, -- date de creation - date_valid datetime, -- date de validation - date_cloture datetime, -- date de cloture - date_commande date, -- date de la commande - fk_user_author integer, -- createur de la commande - fk_user_valid integer, -- valideur de la commande - fk_user_cloture integer, -- auteur cloture + date_creation datetime, -- date de creation + date_valid datetime, -- date de validation + date_cloture datetime, -- date de cloture + date_commande date, -- date de la commande + fk_user_author integer, -- createur de la commande + fk_user_valid integer, -- valideur de la commande + fk_user_cloture integer, -- auteur cloture source smallint, fk_statut smallint default 0, amount_ht real default 0, @@ -46,8 +46,8 @@ create table llx_commande remise_absolue real default 0, remise real default 0, tva double(24,8) default 0, - localtax1 double(24,8) default 0, -- total localtax1 - localtax2 double(24,8) default 0, -- total localtax2 + localtax1 double(24,8) default 0, -- total localtax1 + localtax2 double(24,8) default 0, -- total localtax2 total_ht double(24,8) default 0, total_ttc double(24,8) default 0, note text, @@ -55,11 +55,11 @@ create table llx_commande model_pdf varchar(255), facture tinyint default 0, - fk_cond_reglement integer, -- condition de reglement - fk_mode_reglement integer, -- mode de reglement + fk_cond_reglement integer, -- condition de reglement + fk_mode_reglement integer, -- mode de reglement date_livraison date default NULL, fk_availability integer NULL, - fk_demand_reason integer, -- should be named fk_input_reason - fk_adresse_livraison integer, -- delivery address (deprecated) + fk_demand_reason integer, -- should be named fk_input_reason + fk_adresse_livraison integer, -- delivery address (deprecated) import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index a0d7b35d506..be0ac897b42 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -24,28 +24,28 @@ create table llx_facture ( rowid integer AUTO_INCREMENT PRIMARY KEY, - facnumber varchar(30) NOT NULL, -- invoice reference number - entity integer DEFAULT 1 NOT NULL, -- multi company id + facnumber varchar(30) NOT NULL, -- invoice reference number + entity integer DEFAULT 1 NOT NULL, -- multi company id - ref_ext varchar(50), -- reference into an external system (not used by dolibarr) - ref_int varchar(50), -- reference into an internal system (used by dolibarr) - ref_client varchar(50), -- reference for customer + ref_ext varchar(255), -- reference into an external system (not used by dolibarr) + ref_int varchar(255), -- reference into an internal system (used by dolibarr) + ref_client varchar(255), -- reference for customer - type smallint DEFAULT 0 NOT NULL, -- type of invoice + type smallint DEFAULT 0 NOT NULL, -- type of invoice increment varchar(10), fk_soc integer NOT NULL, - datec datetime, -- date de creation de la facture - datef date, -- date de la facture - date_valid date, -- date de validation - tms timestamp, -- date creation/modification + datec datetime, -- date de creation de la facture + datef date, -- date de la facture + date_valid date, -- date de validation + tms timestamp, -- date creation/modification paye smallint DEFAULT 0 NOT NULL, amount double(24,8) DEFAULT 0 NOT NULL, - remise_percent real DEFAULT 0, -- remise relative - remise_absolue real DEFAULT 0, -- remise absolue - remise real DEFAULT 0, -- remise totale calculee + remise_percent real DEFAULT 0, -- remise relative + remise_absolue real DEFAULT 0, -- remise absolue + remise real DEFAULT 0, -- remise totale calculee - close_code varchar(16), -- Code motif cloture sans paiement complet - close_note varchar(128), -- Commentaire cloture sans paiement complet + close_code varchar(16), -- Code motif cloture sans paiement complet + close_note varchar(128), -- Commentaire cloture sans paiement complet tva double(24,8) DEFAULT 0, -- montant tva apres remise totale localtax1 double(24,8) DEFAULT 0, -- amount localtax1 @@ -55,15 +55,15 @@ create table llx_facture fk_statut smallint DEFAULT 0 NOT NULL, - fk_user_author integer, -- createur de la facture - fk_user_valid integer, -- valideur de la facture + fk_user_author integer, -- createur de la facture + fk_user_valid integer, -- valideur de la facture - fk_facture_source integer, -- facture origine si facture avoir - fk_projet integer, -- projet auquel est associee la facture + fk_facture_source integer, -- facture origine si facture avoir + fk_projet integer, -- projet auquel est associee la facture - fk_cond_reglement integer DEFAULT 1 NOT NULL, -- condition de reglement (30 jours, fin de mois ...) - fk_mode_reglement integer, -- mode de reglement (Virement, Prelevement) - date_lim_reglement date, -- date limite de reglement + fk_cond_reglement integer DEFAULT 1 NOT NULL, -- condition de reglement (30 jours, fin de mois ...) + fk_mode_reglement integer, -- mode de reglement (Virement, Prelevement) + date_lim_reglement date, -- date limite de reglement note text, note_public text, diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql index 460c3c29c63..58142a3f168 100644 --- a/htdocs/install/mysql/tables/llx_localtax.sql +++ b/htdocs/install/mysql/tables/llx_localtax.sql @@ -1,7 +1,6 @@ -- =================================================================== --- Copyright (C) 2002-2003 Rodolphe Quiedeville --- Copyright (C) 2005-2009 Regis Houssin --- Copyright (C) 2011 Juanjo Menent +-- Copyright (C) 2011 Juanjo Menent +-- Copyright (C) 2011 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -21,22 +20,15 @@ create table llx_localtax ( rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, tms timestamp, - datep date, -- date of payment - datev date, -- date of value - amount real NOT NULL DEFAULT 0, - label varchar(255), - entity integer DEFAULT 1 NOT NULL, + datep date, -- date of payment + datev date, -- date of value + amount double, + label varchar(255), note text, fk_bank integer, fk_user_creat integer, - fk_user_modif integer + fk_user_modif integer + )ENGINE=innodb; - --- --- List of codes for the field entity --- --- 1 : first company vat --- 2 : second company vat --- 3 : etc... --- \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index d675f73bbca..a293e9b5c0e 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -23,14 +23,14 @@ create table llx_propal ( rowid integer AUTO_INCREMENT PRIMARY KEY, ref varchar(30) NOT NULL, -- proposal reference number - entity integer DEFAULT 1 NOT NULL, -- multi company id + entity integer DEFAULT 1 NOT NULL, -- multi company id - ref_ext varchar(50), -- reference into an external system (not used by dolibarr) - ref_int varchar(50), -- reference into an internal system (used by dolibarr) - ref_client varchar(50), -- customer proposal number + ref_ext varchar(255), -- reference into an external system (not used by dolibarr) + ref_int varchar(255), -- reference into an internal system (used by dolibarr) + ref_client varchar(255), -- customer proposal number fk_soc integer, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la propale + fk_projet integer DEFAULT 0, -- projet auquel est rattache la propale tms timestamp, datec datetime, -- date de creation