diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 0c5eaddf012..7904d09bc8e 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -890,7 +890,7 @@ class MenuLeft { $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,0,'eldy'); /* - * Menu AUTRES (Pour les menus du haut qui ne serait pas g�r�s) + * Menu AUTRES (Pour les menus du haut qui ne serait pas geres) */ if ($mainmenu && ! in_array($mainmenu,$this->overwritemenufor)) { $mainmenu=""; } diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index ff76ef24527..f2345d94cc3 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -440,6 +440,7 @@ class MenuTop { else $class='class="tmenu"'; print '
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; - $nblignes=6; - if ($product->isproduct() && $conf->stock->enabled) $nblignes++; - if ($product->isservice()) $nblignes++; + $nblignes=4; + if (! empty($conf->global->PRODUIT_MULTIPRICES_LIMIT) && empty($socid)) $nblignes+=$conf->global->PRODUIT_MULTIPRICES_LIMIT; + else $nblignes+=3; + if ($product->is_photo_available($conf->produit->dir_output)) { // Photo - print ''; + print ' | '; $nbphoto=$product->show_photos($conf->produit->dir_output,1,1,0); print ' | '; } @@ -992,7 +993,7 @@ if ($_GET["id"] || $_GET["ref"]) // Nature if($product->type!=1) { - print '
| '.$langs->trans("Nature").' | '; + print ' | ||||
| '.$langs->trans("Nature").' | '; print $product->getLibFinished(); print ' | ||||
| '.$langs->trans("Duration").' | '.$product->duration_value.' '; + print ' | ||||
| '.$langs->trans("Duration").' | '.$product->duration_value.' '; if ($product->duration_value > 1) { $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); @@ -1016,7 +1017,7 @@ if ($_GET["id"] || $_GET["ref"]) else { // Weight / Volume - print ' | ||||
| '.$langs->trans("Weight").' | '; + print ' | ||||
| '.$langs->trans("Weight").' | '; if ($product->weight != '') { print $product->weight." ".measuring_units_string($product->weight_units,"weight"); @@ -1027,7 +1028,7 @@ if ($_GET["id"] || $_GET["ref"]) } print " | ||||
| '.$langs->trans("Volume").' | '; + print ' | ||||
| '.$langs->trans("Volume").' | '; if ($product->volume != '') { print $product->volume." ".measuring_units_string($product->volume_units,"volume"); @@ -1040,7 +1041,7 @@ if ($_GET["id"] || $_GET["ref"]) } // Note - print ' | ||||
| '.$langs->trans("Note").' | '.nl2br($product->note).' | ||||
| '.$langs->trans("Note").' | '.nl2br($product->note).' | ||||
| ';
@@ -224,7 +225,7 @@ if ($_GET["id"] || $_GET["ref"])
$imgWidth = ($product->imgWidth < $maxWidth) ? $product->imgWidth : $maxWidth;
$imgHeight = ($product->imgHeight < $maxHeight) ? $product->imgHeight : $maxHeight;
- print ' '.$viewfilename; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index f06a43d221a..829303d24b6 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -89,7 +89,7 @@ if ($_GET["id"] || $_GET["ref"]) // Reference print ' | |||||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | ||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("Ref").' | '; + print ' | '.$langs->trans("Ref").' | '; print $html->showrefnav($product,'ref','',1,'ref'); print ' | '; print '||||
| '.$langs->trans("WarehouseSource").' | '; $formproduct->selectWarehouses($_GET["dwid"],'id_entrepot_source','',1); @@ -324,7 +324,7 @@ if ($_GET["id"] || $_GET["ref"]) print ' | '; print ''.$langs->trans("NumberOfUnit").' | '; print ' |
| '.$langs->trans("Label").' | '; diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index d9862bf77e6..f79e2ae6646 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -919,6 +919,12 @@ a.impayee:hover { font-weight: bold; color: #550000; } browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-weight: normal; color: #57A2CA; diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php index 22344ed8674..13affd135a0 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css.php +++ b/htdocs/theme/bluelagoon/bluelagoon.css.php @@ -634,6 +634,12 @@ a.impayee:hover { font-weight: bold; color: #550000; } browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-family: Helvetica, Verdana; font-weight: normal; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 2835cb1b731..58ccc4a6f12 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -1017,6 +1017,12 @@ a.impayee:hover { font-weight: bold; color: #550000; } browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index 40fa12f478d..b3d94f9b9b0 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -733,6 +733,12 @@ a.impayee:hover { font-weight: bold; color: #550000; } browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/rodolphe.css.php index 194e9b8c141..a319ea21bdb 100644 --- a/htdocs/theme/rodolphe/rodolphe.css.php +++ b/htdocs/theme/rodolphe/rodolphe.css.php @@ -649,10 +649,18 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #000055; } + #pictotitle { browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index e369f1de082..577a85b20c1 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -723,6 +723,12 @@ a.impayee:hover { font-weight: bold; color: #550000; } browser->phone)?'display: none;':''; ?> } +.photo { +border: 0px; +/* filter:alpha(opacity=55); */ +/* opacity:.55; */ +} + div.titre { font-family: helvetica, verdana, arial, sans-serif; font-weight: normal;