From 8349446340f63c7e02390aa764f691cfada0e640 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 19 Feb 2016 10:59:50 +0100 Subject: [PATCH 1/2] No segment defined is not an error This is a proposition of correction on all ODT file If we don't define table of segment on odt we have an error But in some case we don't want an table on ODT --- .../project/doc/doc_generic_project_odt.modules.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 6155e38b4ca..6061ec8f548 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -698,9 +698,14 @@ class doc_generic_project_odt extends ModelePDFProjects } catch(OdfException $e) { - $this->error=$e->getMessage(); - dol_syslog($this->error, LOG_WARNING); - return -1; + $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 From f0736a30a6cc7ca0d5fe3ed33be6271fa126c635 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Thu, 25 Feb 2016 14:53:06 +0100 Subject: [PATCH 2/2] Added Malta VAT Hope use it Soon ;-) --- htdocs/install/mysql/data/llx_c_tva.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 24c2b1099fa..a75bb531acf 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/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);