From d09e8a522d34f5c07cc5d330292fa5e42fd7970c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jul 2013 01:05:10 +0200 Subject: [PATCH 1/3] Fix: PHPunit match previous fix of civility label empty --- test/phpunit/AdherentTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php index d61b3fc6cf2..a42b7476218 100644 --- a/test/phpunit/AdherentTest.php +++ b/test/phpunit/AdherentTest.php @@ -314,7 +314,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase '%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'. '%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%'; - $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',0,New firstname,New name,New firstname New name,'. + $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'. 'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'. 'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium'; From 46c3b1eb1f166e70ee96a91bc6bd8974fe2a6cd9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jul 2013 01:26:52 +0200 Subject: [PATCH 2/3] Missing vat rate --- htdocs/install/mysql/data/llx_c_tva.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index b198db78fe2..df651bdb6f7 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -267,7 +267,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (19 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246, '0','0','VAT Rate 0',1); --- MAURITIUS (id country=15) +-- MAURITANIA (id country=151) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1511,151, '0','0','VAT Rate 0',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1512,151, '14','0','VAT Rate 14',1); + +-- MAURITIUS (id country=152) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1521,152, '0','0','VAT Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1522,152, '15','0','VAT Rate 15',1); From 3a8287ba61b80fae7fee5a6caeac095e8b894636 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jul 2013 01:43:25 +0200 Subject: [PATCH 3/3] Update doc --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 257d19e60fb..c5cf2ecf7e9 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,6 @@ This is features that Dolibarr does not support completely yet: - No double party accountancy (only bank management). - Dolibarr manage one currency at once (mono-currency). - Dolibarr manage one master company/foundation (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas). -- Does not support double VAT (Federal / provincial) for Canada. - Dolibarr does not contains Payroll module. - Tasks on module project can't have dependencies between each other. - Dolibarr does not include any Webmail.