diff --git a/ChangeLog b/ChangeLog index 3aa54336829..54f5b31b06a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,8 @@ For users: - New: [ task #823 ] Shipping_validate email notification. - New: [ task #900 ] Review code of ficheinter.class.php - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers +- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search +- Fix : [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array For translators: - Update language files. 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 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/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 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/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 675abfbc634..308d45f18f7 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -118,12 +118,12 @@ print '
'; print $langs->trans("NoteOnPathLocation").'
'; -$url1='http://www.maxmind.com/app/perl?rId=awstats'; +$url1='http://www.maxmind.com/en/city?rId=awstats'; print $langs->trans("YouCanDownloadFreeDatFileTo",''.$url1.''); print '
'; -$url2='http://www.maxmind.com/app/perl?rId=awstats'; +$url2='http://www.maxmind.com/en/city?rId=awstats'; print $langs->trans("YouCanDownloadAdvancedDatFileTo",''.$url2.''); if ($geoip) diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 085d33f3df0..85a707339f6 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -52,10 +52,10 @@ if ($action == 'update') dolibarr_set_const($db, "MAIN_PDF_FORMAT", $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity); - dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"],'chaine',0,'',$conf->entity); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index edfbb35f5cd..21b55a39413 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -636,9 +636,9 @@ class Commande extends CommonOrder $sql.= ", remise_absolue, remise_percent"; $sql.= ", entity"; $sql.= ")"; - $sql.= " VALUES ('(PROV)',".$this->socid.", ".$this->db->idate($now).", ".$user->id; + $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id; $sql.= ", ".($this->fk_project?$this->fk_project:"null"); - $sql.= ", ".$this->db->idate($date); + $sql.= ", '".$this->db->idate($date)."'"; $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null'); $sql.= ", '".$this->db->escape($this->note_private)."'"; $sql.= ", '".$this->db->escape($this->note_public)."'"; @@ -989,7 +989,7 @@ class Commande extends CommonOrder $this->fetch($ret); $this->valid($user); } - return 1; + return $ret; } else return -1; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 114a2356c6d..267815f8ddf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -892,7 +892,7 @@ class Form if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only) { - $out.= ajax_combobox($htmlname, $event); + $out.= ajax_combobox($htmlname, $event, $conf->global->CONTACT_USE_SEARCH_TO_SELECT); } if ($htmlname != 'none' || $options_only) $out.= '