diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index d8b60b79a07..7f84b773c15 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -513,7 +513,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) { //RODO $smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/'; - $smarty->display('fiche-create.tpl'); + $smarty->display($product->canvas.'-create.tpl'); } } @@ -605,40 +605,8 @@ if ($_GET["id"] || $_GET["ref"]) print ''; - $smarty->display('fiche-view.tpl'); + $smarty->display($product->canvas.'-view.tpl'); - // Statut - print ''.$langs->trans("Status").''; - print $product->getLibStatut(2); - print ''; - - // TVA - - print ''.$langs->trans("VATRate").''.$product->tva_tx.'%'; - - // Description - print ''.$langs->trans("Description").''.nl2br($product->description).''; - - // Durée - if ($product->type == 1) - { - print ''.$langs->trans("Duration").''.$product->duration_value.' '; - - if ($product->duration_value > 1) - { - $dur=array("d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); - } - else { - $dur=array("d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); - } - print $langs->trans($dur[$product->duration_unit])." "; - - print ''; - } - - // Note - print ''.$langs->trans("Note").''.nl2br($product->note).''; - print "\n"; print "\n\n"; } @@ -878,7 +846,7 @@ if ($_GET["id"] || $_GET["ref"]) } else { - $smarty->display('fiche-edit.tpl'); + $smarty->display($product->canvas.'-edit.tpl'); } } }