Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2012-11-20 13:36:03 +01:00
commit 2e0554bfbd
2 changed files with 33 additions and 38 deletions

View File

@ -804,3 +804,5 @@ ALTER TABLE llx_c_typent DROP INDEX code, ADD UNIQUE uk_c_typent (code);
ALTER TABLE llx_c_effectif DROP INDEX code, ADD UNIQUE uk_c_effectif (code); ALTER TABLE llx_c_effectif DROP INDEX code, ADD UNIQUE uk_c_effectif (code);
ALTER TABLE llx_c_paiement DROP INDEX code, ADD UNIQUE uk_c_paiement (code); ALTER TABLE llx_c_paiement DROP INDEX code, ADD UNIQUE uk_c_paiement (code);
-- increase field size
ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);

View File

@ -1,7 +1,7 @@
-- ============================================================================= -- =============================================================================
-- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> -- Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
-- --
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
@ -30,7 +30,7 @@ create table llx_bank_account
label varchar(30) NOT NULL, label varchar(30) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
bank varchar(60), bank varchar(60),
code_banque varchar(7), code_banque varchar(8),
code_guichet varchar(6), code_guichet varchar(6),
number varchar(255), number varchar(255),
cle_rib varchar(5), cle_rib varchar(5),
@ -52,12 +52,5 @@ create table llx_bank_account
min_allowed integer DEFAULT 0, min_allowed integer DEFAULT 0,
min_desired integer DEFAULT 0, min_desired integer DEFAULT 0,
comment text comment text
)ENGINE=innodb;
-- )ENGINE=innodb;
-- List of codes for the field entity
--
-- 1 : first company bank account
-- 2 : second company bank account
-- 3 : etc...
--