Skip to content
Snippets Groups Projects
Commit daeada4b authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

defrance-patch-70

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
parents d3bfbbf5 b7e148d1
No related branches found
No related tags found
No related merge requests found
......@@ -787,4 +787,6 @@ UPDATE llx_c_departements SET code_departement='VI' WHERE ncc='ALAVA' AND fk_reg
UPDATE llx_c_departements SET code_departement='CE' WHERE ncc='CEUTA' AND fk_region=407;
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_regions WHERE code_region=420 and fk_pays=4;
\ No newline at end of file
DELETE FROM llx_c_regions WHERE code_region=420 and fk_pays=4;
ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(62);
......@@ -22,7 +22,7 @@ create table llx_c_paiement
(
id integer PRIMARY KEY,
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
active tinyint DEFAULT 1 NOT NULL,
accountancy_code varchar(32) NULL,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment