Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop

ChangeLog

@@ -3,7 +3,7 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
-***** ChangeLog for 3.3 compared to 3.2.1 *****
+***** ChangeLog for 3.3 compared to 3.2.2 *****
 For users:
 - New: If field "signature" is filled into user table, text is added 
   at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this
@@ -70,6 +70,11 @@ For translators:
 
 
 
+***** ChangeLog for 3.2.2 compared to 3.2.1 *****
+Fix: Modify spanish VAT to new rates
+
+
+
 ***** ChangeLog for 3.2.1 compared to 3.2.0 *****
 - Fix: Edit of projects.
 - Fix: Activation of modules does not fails if directory install was removed.

htdocs/install/mysql/data/llx_c_tva.sql

@@ -190,8 +190,8 @@ INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUE
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2023, 202,  '0', '0', 'VAT Rate 0', 1);
 
 -- SPAIN (id country=4)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 41, 4,  '18','0','4','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 42, 4,   '8','0','1','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 41, 4,  '21','0','5.2','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 42, 4,   '10','0','1.4','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 43, 4,   '4','0','0.5','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active)           values ( 44, 4,   '0','0','VAT Rate 0',1);
 

htdocs/install/mysql/migration/3.1.0-3.2.0.sql

@@ -455,8 +455,6 @@ ALTER TABLE llx_facture_fourn ADD COLUMN extraparams varchar(255) AFTER import_k
 
 ALTER TABLE llx_boxes ADD COLUMN maxline integer NULL;
 
-ALTER TABLE llx_commande_fournisseur ADD COLUMN date_livraison date NULL;
-
 ALTER TABLE llx_product_fournisseur_price MODIFY fk_product_fournisseur integer DEFAULT 0;
 
 UPDATE llx_product SET canvas = NULL where canvas = 'default@product';

htdocs/install/mysql/migration/repair.sql

@@ -51,6 +51,8 @@ UPDATE llx_product SET canvas = NULL where canvas = 'default@product';
 
 DELETE FROM llx_boxes where box_id NOT IN (SELECT rowid FROM llx_boxes_def);
 
+DELETE FROM llx_document_model WHERE nom ='elevement' AND type='delivery';
+
 -- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid
 -- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note)