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. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index a0dc87df664..5755d9a1cbc 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -1018,5 +1018,3 @@ Type: filesandordirs; Name: "{app}\www\dolibarr" [UninstallRun] Filename: "{app}\uninstall_services.bat"; Flags: runhidden - - 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. 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 diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 004aa49f873..3f0b8edb98c 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.5.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 2f7fb6b6cf2..b8bcfe6876a 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.5.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 97ffe57ea07..9140f353df6 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.5.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 153fbe2403b..1ebdac399bb 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.5.0-0.1.a - Initial version (#723326) 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)