diff --git a/ChangeLog b/ChangeLog index 1763325fd3e..2c85b48924f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ FIX: Not showing delivery date on rouget pdf FIX: Not showing task extrafields when creating from left menu FIX [ bug #3288 ] Tasks box is not properly drawn FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts +FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights NEW: Created new ContratLigne::insert function diff --git a/build.xml b/build.xml index 570821a7c7b..c6995ce95f3 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ + -fdfds diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index a556798cdd1..26a2aef8e12 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -498,7 +498,6 @@ if ($resql) print "\n"; // Lignes des champs de filtre - print ''; print ''; print ''; @@ -549,7 +548,6 @@ if ($resql) print ''; print ''; print "\n"; - print ''; $arrayofuniqueproduct=array(); @@ -621,7 +619,7 @@ if ($resql) } $db->free($resql); - print "
"; + print "
"; // Add number of product when there is a filter on period if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index a6438d4709b..7de6fdec844 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -709,7 +709,7 @@ class Societe extends CommonObject $this->localtax2_value=trim($this->localtax2_value); $this->capital=price2num(trim($this->capital),'MT'); - if (empty($this->capital)) $this->capital = 0; + if (empty($this->capital) || ! is_numeric($this->capital)) $this->capital = 0; $this->effectif_id=trim($this->effectif_id); $this->forme_juridique_code=trim($this->forme_juridique_code); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 554fdc4b190..79c4a123022 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -725,7 +725,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'; print ''; print ''; - if (! empty($ldap_sid)) print ''; + if (! empty($ldap_sid)) print ''; print ''; dol_fiche_head('', '', '', 0, '');