From ac6e56f0586fc20c9e30201e2e12fb507a73adcc Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 30 Apr 2013 21:10:26 +0200 Subject: [PATCH 1/5] Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur --- htdocs/core/lib/security.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index b4ddaf160e4..b2b3ebbd579 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -219,7 +219,9 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature { foreach($feature2 as $subfeature) { - if (empty($user->rights->$feature->$subfeature->creer) && empty($user->rights->$feature->$subfeature->write)) $createok=0; + if (empty($user->rights->$feature->$subfeature->creer) + && empty($user->rights->$feature->$subfeature->write) + && empty($user->rights->$feature->$subfeature->create)) $createok=0; else { $createok=1; break; } // For bypass the second test if the first is ok } } From 440912a4d3b24165271ae256c2cc656404965c81 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 30 Apr 2013 21:35:27 +0200 Subject: [PATCH 2/5] fix [ bug #827 ] AJAX search does not respect multiprice level --- htdocs/product/ajax/products.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index 8fd68e2b954..3fed5d5152c 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -157,7 +157,7 @@ else $form = new Form($db); if (empty($mode) || $mode == 1) { - $arrayresult=$form->select_produits_do("",$htmlname,$type,"",$pricelevel,$searchkey,$status,2,$outjson); + $arrayresult=$form->select_produits_do("",$htmlname,$type,"",$price_level,$searchkey,$status,2,$outjson); } elseif ($mode == 2) { From e9f02ebacf477a19951071902c4cae238da09201 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 30 Apr 2013 21:45:40 +0200 Subject: [PATCH 3/5] Update change log --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6c7dc510b48..2057fe6e065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,9 @@ English Dolibarr ChangeLog - Fix: [ bug #855 ] Holiday approval email in French - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email - Fix: [ bug #857 ] Invoice created from shipment does not have the order discount +- Fix: [ bug #861 ] Erreur de droit groupe et utilisateur +- Fix: [ bug #827 ] AJAX search does not respect multiprice level +- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work ***** ChangeLog for 3.3.1 compared to 3.3 ***** From 3933fb318c217db2b5b55a8645d22d4a883b3d7d Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 30 Apr 2013 21:57:34 +0200 Subject: [PATCH 4/5] update change log --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2057fe6e065..78461615bf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,7 @@ English Dolibarr ChangeLog - Fix: [ bug #855 ] Holiday approval email in French - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email - Fix: [ bug #857 ] Invoice created from shipment does not have the order discount -- Fix: [ bug #861 ] Erreur de droit groupe et utilisateur +- Fix: [ bug #861 ] Impossible to create a new event in agenda - Fix: [ bug #827 ] AJAX search does not respect multiprice level - Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work From 7e47b37adedeed0e58caf39251c667532b6bb63b Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 2 May 2013 13:56:14 +0200 Subject: [PATCH 5/5] Fix [ bug #788 ] Date of linked interventions are not shown --- ChangeLog | 1 + htdocs/projet/element.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 78461615bf6..7ee5a3e341c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ English Dolibarr ChangeLog - Fix: [ bug #861 ] Impossible to create a new event in agenda - Fix: [ bug #827 ] AJAX search does not respect multiprice level - Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work +- Fix: [ bug #788 ] Date of linked interventions are not shown ***** ChangeLog for 3.3.1 compared to 3.3 ***** diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 9e5f8da0e3b..0f6f7b55313 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -223,6 +223,7 @@ foreach ($listofreferent as $key => $value) $date=$element->date; if (empty($date)) $date=$element->datep; if (empty($date)) $date=$element->date_contrat; + if (empty($date)) $date=$element->datev; //Fiche inter print ''.dol_print_date($date,'day').''; // Third party