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

Merge branch 'patch-70' of https://github.com/defrance/dolibarr into

Browse Source 
defrance-patch-70

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
This commit is contained in:
Laurent Destailleur 2015-08-12 22:12:50 +02:00
commit daeada4bae
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@ -788,3 +788,5 @@ UPDATE llx_c_departements SET code_departement='CE' WHERE ncc='CEUTA' AND fk_reg
UPDATE llx_c_departements SET code_departement='ML' WHERE ncc='MELILLA' AND fk_region=409; UPDATE llx_c_departements SET code_departement='ML' WHERE ncc='MELILLA' AND fk_region=409;
DELETE FROM llx_c_departements WHERE ncc='OTROS' AND fk_region=420; DELETE FROM llx_c_departements WHERE ncc='OTROS' AND fk_region=420;
DELETE FROM llx_c_regions WHERE code_region=420 and fk_pays=4; DELETE FROM llx_c_regions WHERE code_region=420 and fk_pays=4;
ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(62);

2
htdocs/install/mysql/tables/llx_c_paiement.sql
View File

@ -22,7 +22,7 @@ create table llx_c_paiement
( (
id integer PRIMARY KEY, id integer PRIMARY KEY,
code varchar(6) NOT NULL, code varchar(6) NOT NULL,
libelle varchar(30), libelle varchar(62),
type smallint, -- 0: input money, 1: output money, 2: input and output, 3: other type smallint, -- 0: input money, 1: output money, 2: input and output, 3: other
active tinyint DEFAULT 1 NOT NULL, active tinyint DEFAULT 1 NOT NULL,
accountancy_code varchar(32) NULL, accountancy_code varchar(32) NULL,