diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 834f16c7737..42f1a2a67d0 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -687,7 +687,6 @@ class Don extends CommonObject $this->societe = $obj->societe; $this->statut = $obj->fk_statut; $this->address = $obj->address; - $this->town = $obj->town; $this->zip = $obj->zip; $this->town = $obj->town; $this->country_id = $obj->fk_country; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index f4ee61190e8..ae2150e8464 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -515,7 +515,7 @@ else print ''.$objp->produit.''; print ''; - $valtoshow=price2num($objp->value, 'MS'); + $valtoshow=price(price2num($objp->value, 'MS'), 0, '', 0, 0); // TODO replace with a qty() function print empty($valtoshow)?'0':$valtoshow; print ''; $totalunit+=$objp->value; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b21a399f8bd..db4b494179d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1839,6 +1839,12 @@ a.tmenuimage { $found=1; break; } + else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + { + $url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); + $found=1; + break; + } } // Img file not found if (! $found) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fcff90c4359..85918a43245 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1819,6 +1819,12 @@ foreach($mainmenuusedarray as $val) $found=1; break; } + else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + { + $url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); + $found=1; + break; + } } // Img file not found if (! $found)