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

htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

@@ -697,11 +697,16 @@ class doc_generic_project_odt extends ModelePDFProjects
 					$odfHandler->mergeSegment($listlines);
 				}
 				catch(OdfException $e)
+				{
+					$ExceptionTrace=$e->getTrace();
+					// no segment defined on ODT is not an error
+					if($ExceptionTrace[0]['function'] != 'setSegment')
 					{
 						$this->error=$e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
+				}
 
 				// Replace tags of project files
 				try

htdocs/install/mysql/data/llx_c_tva.sql

@@ -170,6 +170,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (12
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (124,  12,  '7','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (125,  12,  '0','0','VAT Rate 0', 1);
 
+-- MALTA (id country=148)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1481,  148, '18','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1482,  148, '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1483,  148, '5','0','VAT super-reduced rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1484,  148, '0','0','VAT Rate 0', 1);
+
 -- NEDERLAND (id country=17)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171, 17,  '19','0','Algemeen BTW tarief',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172, 17,   '6','0','Verlaagd BTW tarief', 1);