From fb0a99cb55f75eae9efa6b9679222649c9e16864 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Thu, 13 Jun 2013 15:05:19 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20[=20bug=20#934=20]=20Impossible=20de?= =?UTF-8?q?=20cr=C3=A9er=20une=20facture=20pr=C3=A9d=C3=A9finie=20(pgsql)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 1 + htdocs/compta/facture/class/facture-rec.class.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddafb08d110..5ef0217d077 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.3.3 compared to 3.3.2 ***** - Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php +- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql) ***** ChangeLog for 3.3.2 compared to 3.3.1 ***** diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index b41fa735e7c..105885bfe1f 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -122,8 +122,8 @@ class FactureRec extends Facture $sql.= ", '".$facsrc->socid."'"; $sql.= ", ".$conf->entity; $sql.= ", ".$this->db->idate($now); - $sql.= ", '".$facsrc->amount."'"; - $sql.= ", '".$facsrc->remise."'"; + $sql.= ", ".(!empty($facsrc->amount)?$facsrc->amount:'0'); + $sql.= ", ".(!empty($facsrc->remise)?$this->remise:'0'); $sql.= ", '".$this->db->escape($this->note)."'"; $sql.= ", '".$user->id."'"; $sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null"); From 676191c1f9a54c4cee32d6f0ce1ce07448403420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Wed, 19 Jun 2013 10:22:46 +0200 Subject: [PATCH 2/6] Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 --- ChangeLog | 1 + htdocs/comm/propal.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ef0217d077..59549e19355 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ English Dolibarr ChangeLog - Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php - Fix: [ bug #934 ] Error on proformat invoice creation (pgsql) +- Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 ***** ChangeLog for 3.3.2 compared to 3.3.1 ***** diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 330585b1e9d..c0179e3189c 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -641,7 +641,8 @@ else if ($action == "addline" && $user->rights->propal->creer) setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors'); $error++; } - if ((empty($idprod) || GETPOST('usenewaddlineform')) && (!($price_ht != 0) || $price_ht == '')) // Unit price can be 0 but not ''. Also price can be negative for proposal. + + if ((empty($idprod) || GETPOST('usenewaddlineform')) && $price_ht == '') // Unit price can be 0 but not ''. Also price can be negative for proposal. { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")), 'errors'); $error++; From 76d9ba6a431281029dcf37ab98092ebef04cf4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Wed, 19 Jun 2013 10:24:24 +0200 Subject: [PATCH 3/6] Fixed es_ES translation typo --- htdocs/langs/es_ES/categories.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 7521b9c03dc..e51ab577533 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -42,7 +42,7 @@ ErrCatAlreadyExists=Este nombre esta siendo utilizado AddProductToCat=¿Añadir este producto a una categoría? ImpossibleAddCat=Imposible añadir la categoría ImpossibleAssociateCategory=Imposible asociar la categoría -WasAddedSuccessfully=se ha añadido con éxito. +WasAddedSuccessfully=La categoría se ha añadido con éxito. ObjectAlreadyLinkedToCategory=El elemento ya está enlazado a esta categoría CategorySuccessfullyCreated=La categoría %s se insertado correctamente. ProductIsInCategories=Este producto/servicio se encuentra en las siguientes categorías From ee1e266774e6ae54fbca61e9efe6121226762374 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Wed, 19 Jun 2013 11:22:53 +0200 Subject: [PATCH 4/6] Fix trad holidays module --- htdocs/langs/fr_FR/holiday.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index be368bf661a..c0954366b27 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -85,8 +85,8 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congès -LastDayOfHoliday=Dernier jour de congès +FirstDayOfHoliday=Premier jour de congés +LastDayOfHoliday=Dernier jour de congés HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle From 187feff7d5eb21e24e60000fae6136b74658fb10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Jun 2013 20:40:22 +0200 Subject: [PATCH 5/6] Prepare 3.3.3 --- build/debian/changelog | 2 +- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- build/perl/virtualmin/dolibarr.pl | 2 +- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- htdocs/filefunc.inc.php | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index b9302cfc624..d364648aadc 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -dolibarr (3.3.2+nmu1) unstable; urgency=low +dolibarr (3.3.3+nmu1) unstable; urgency=low * Non-maintainer upload. * New upstream release. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 4f9b0fabea6..90d0595b41b 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.3.2 +AppVerName=DoliWamp-3.3.3 ; 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.3.2 +OutputBaseFilename=DoliWamp-3.3.3 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=C:\Documents and Settings\ldestailleur\git\dolibarr_old diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index ee44ac8a493..2510da50a08 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="3"; -$BUILD="2"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="3"; # 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/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl index 0ede11d9968..0f7f95ff7d7 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/build/perl/virtualmin/dolibarr.pl @@ -30,7 +30,7 @@ return "Regis Houssin"; # script_dolibarr_versions() sub script_dolibarr_versions { -return ( "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" ); +return ( "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" ); } sub script_dolibarr_category diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 8f36bc14805..a72b4955342 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -332,5 +332,5 @@ fi %changelog -* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3 +* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 3e0bb99f586..efa2ba5b12b 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -521,5 +521,5 @@ fi %changelog -* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3 +* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index dad739ba8b9..54878c1c568 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -321,5 +321,5 @@ fi %changelog -* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3 +* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index efe8152687b..a996497f273 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -332,5 +332,5 @@ fi %changelog -* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3 +* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index f3780d0876a..5249c47e4ea 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.3.2'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.3'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants From 2af8f295b12f525cc37fafdc2a472d8e2abbdb50 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Jun 2013 21:25:09 +0200 Subject: [PATCH 6/6] Fix: warning not always visible. Depends if addon modules were installed. Var should provide a quick fix. --- htdocs/admin/index.php | 2 +- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 41d52b93834..6bb21958b7c 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -68,7 +68,7 @@ print '
'; print '
'; //print '
'; print img_picto('','puce').' '.$langs->trans("SetupDescription4",DOL_URL_ROOT.'/admin/modules.php?mainmenu=home'); -if (count($conf->modules) <= 1) // If only user module enabled +if (count($conf->modules) <= (empty($conf->global->MAIN_MINNB_MODULE)?1:$conf->global->MAIN_MINNB_MODULE)) // If only user module enabled { $langs->load("errors"); $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 18becb5d0e4..c9f3dc02677 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -660,7 +660,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) } $newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").' '.$warnpicto,1); $warnpicto=''; - if (count($conf->modules) <= 1) // If only user module enabled + if (count($conf->modules) <= (empty($conf->global->MAIN_MINNB_MODULE)?1:$conf->global->MAIN_MINNB_MODULE)) // If only user module enabled { $langs->load("errors"); $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));