From e83e44a012ad93d9c08a561c3a3961d1040b5b3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jul 2013 21:57:51 +0200 Subject: [PATCH 1/5] Update doc --- README | 1 - README-FR | 1 - 2 files changed, 2 deletions(-) diff --git a/README b/README index 2b320d665c1..c6ac993180c 100644 --- a/README +++ b/README @@ -132,7 +132,6 @@ This is features that Dolibarr does not support completely yet: - No accountancy (only bank management). - Dolibarr manage one currency at once (mono-currency). - Dolibarr manage one 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. diff --git a/README-FR b/README-FR index cc69cfa6e8a..8b3900ff78c 100644 --- a/README-FR +++ b/README-FR @@ -122,7 +122,6 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr: - Pas de compta analytique (uniquement gestion de trésorerie). - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise). - Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données. -- Ne gère pas la double tva (Fédérale / provinciale) du canada. - Dolibarr ne contient pas de module de Gestion de la paie. - Les taches du module de gestion de projets n'ont pas de dépendance entre elle. - Dolibarr ne contient pas de Webmail. From 0de1fe893a6fc4ff7272c62cbf14c06a596fd1c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jul 2013 13:30:30 +0200 Subject: [PATCH 2/5] Prepare 3.4 --- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- build/rpm/dolibarr_fedora.spec | 4 ++-- build/rpm/dolibarr_generic.spec | 3 ++- build/rpm/dolibarr_mandriva.spec | 4 ++-- build/rpm/dolibarr_opensuse.spec | 3 ++- htdocs/filefunc.inc.php | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 41e860e5927..7510ff88152 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -AppVerName=DoliWamp-3.4.0-beta +AppVerName=DoliWamp-3.4.0 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x -OutputBaseFilename=DoliWamp-3.4.0-beta +OutputBaseFilename=DoliWamp-3.4.0 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c6bb2a1f174..dd348af17a6 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="4"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index b4ced0c5088..1479a5bf023 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -320,7 +320,7 @@ then fi - +# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog -* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b +* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index cdc0ce0714a..76cd214359e 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -538,6 +538,7 @@ fi +# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog -* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b +* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 51d911148eb..e93c6ad87a9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -321,7 +321,7 @@ then fi - +# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog -* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b +* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 7744c43695b..9d35c70b419 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -333,6 +333,7 @@ fi +# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog -* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b +* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 545a0254eed..5462c1fda7f 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -29,7 +29,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.0-beta'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.0'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants From b16689e8b7a5ee251f13bb81556519f1392d97b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jul 2013 13:32:45 +0200 Subject: [PATCH 3/5] Prepare 3.4 --- build/pad/pad_dolibarr.xml | 4 ++-- build/pad/pad_doliwamp.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index d3550c7c57e..bd379443cf7 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -35,8 +35,8 @@ Dolibarr 3.4 - 05 - 17 + 07 + 07 2013 diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index 7e4c779489b..320751fd489 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -35,8 +35,8 @@ DoliWamp 3.4 - 05 - 17 + 07 + 07 2013 From a687cc429cff244e727f7b9595df2db591110d53 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jul 2013 13:35:29 +0200 Subject: [PATCH 4/5] Update doc for 3.4 --- build/makepack-howto.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 0f5ffef71d9..5a130227945 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -9,13 +9,13 @@ beta version of Dolibarr, step by step. - Check all files are commited. - Update version/info in /ChangeLog -- Update version number with x.x.x-y in htdocs/filefunc.inc.php -- Update version number with x.x.x-y in build/makepack-dolibarr.pl -- Update version number with x.x.x-y in build/debian/changelog -- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss -- Update version number with x.x.x-y in build/rpm/*.spec -- Update version number with x.x.x in build/doxygen/dolibarr-doxygen.doxyfile -- Update version number with x.x.x in build/perl/virtualmin/dolibarr.pl +- Update version number with x.y.z-w in htdocs/filefunc.inc.php +- Update version number with x.y.z-w in build/makepack-dolibarr.pl +- Update version number with x.y.z-w in build/debian/changelog +- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss +- Update version number with x.y.z-w in build/rpm/*.spec +- Update version number with x.y.z in build/doxygen/dolibarr-doxygen.doxyfile +- Update version number with x.y.z in build/perl/virtualmin/dolibarr.pl - Commit all changes. - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags - Create a branch (x.y). @@ -33,14 +33,14 @@ complete release of Dolibarr, step by step. - Check all files are commited. - Update version/info in ChangeLog -- Update version number with x.x.x in htdocs/filefunc.inc.php -- Update version number with x.x.x in build/makepack-dolibarr.pl -- Update version number with x.x.x in build/debian/changelog -- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss -- Update version number with x.x.x in build/rpm/*.spec +- Update version number with x.y.z in htdocs/filefunc.inc.php +- Update version number with x.y.z in build/makepack-dolibarr.pl +- Update version number with x.y.z in build/debian/changelog +- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss +- Update version number with x.y.z in build/rpm/*.spec - Update PAD files. - Commit all changes. -- Add a Tag (DOLIBARR_x_y) +- Add a Tag (x.y.z) - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl - Check content of built packages. From 05461c47cc403f66d418ab8d0fa99b6aa56cfe64 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jul 2013 23:22:00 +0200 Subject: [PATCH 5/5] Fix: vat rate for slovenia --- htdocs/install/mysql/data/llx_c_tva.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index df651bdb6f7..d96bc2d3f36 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -211,8 +211,8 @@ INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (20 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2013, 201, '0', '0', 'VAT Rate 0', 1); -- SLOVENIA (id country=202) -INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2021, 202, '20', '0', 'VAT standard rate', 1); -INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2022, 202,'8.5', '0', 'VAT reduced rate', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2021, 202, '22', '0', 'VAT standard rate', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2022, 202,'9.5', '0', 'VAT reduced rate', 1); 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)