diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 55fc63df8d0..0f88a16d7f2 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -473,6 +473,8 @@ elseif ($action == 'addline') // cas special pour lequel on a les meme reference que le fournisseur // $label = '['.$product->ref.'] - '. $product->libelle; $label = $product->description; + $label.= $product->description && $_POST['np_desc'] ? "\n" : ""; + $label.= $_POST['np_desc']; $tvatx=get_default_tva($object->thirdparty, $mysoc, $product->id, $_POST['idprodfournprice']); @@ -1784,12 +1786,19 @@ else print ''; $form->select_produits_fournisseurs($object->socid,'','idprodfournprice'); + if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) print '
'; + if (is_object($hookmanager)) { $parameters=array('htmlname'=>'idprodfournprice'); echo $hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action); } + $nbrows=ROWS_2; + if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; + $doleditor = new DolEditor('np_desc', GETPOST('np_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70); + $doleditor->Create(); + print ''; print ''; print ' ';