diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 4584eb23fd9..6f94495d4b7 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -485,7 +485,7 @@ if ($_GET['action'] == 'modif' && $user->rights->propale->creer) */ if ($_POST['action'] == "addligne" && $user->rights->propale->creer) { - if ($_POST['qty'] && (($_POST['np_price']!='' && $_POST['np_desc']) || $_POST['idprod'])) + if ($_POST['qty'] && (($_POST['np_price']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) { $propal = new Propal($db); $ret=$propal->fetch($_POST['propalid']); @@ -544,7 +544,7 @@ if ($_POST['action'] == "addligne" && $user->rights->propale->creer) { $pu_ht=$_POST['np_price']; $tva_tx=$_POST['np_tva_tx']; - $desc=$_POST['np_desc']; + $desc=$_POST['dp_desc']; } $result=$propal->addline( @@ -1402,12 +1402,12 @@ if ($_GET['propalid'] > 0) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS_PERSO) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('np_desc','',100,'dolibarr_details'); + $doleditor=new DolEditor('dp_desc','',100,'dolibarr_details'); $doleditor->Create(); } else { - print ''; + print ''; } print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 9fd2ecce9ed..ff4fdfa5c67 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -299,7 +299,7 @@ if ($_REQUEST['action'] == 'setremiseabsolue' && $user->rights->facture->creer) */ if ($_POST['action'] == 'addligne' && $user->rights->commande->creer) { - if ($_POST['qty'] && (($_POST['pu'] != '' && $_POST['np_desc']) || $_POST['idprod'])) + if ($_POST['qty'] && (($_POST['pu'] != '' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) { $commande = new Commande($db); $ret=$commande->fetch($_POST['id']); @@ -359,7 +359,7 @@ if ($_POST['action'] == 'addligne' && $user->rights->commande->creer) { $pu_ht=$_POST['pu']; $tva_tx=$_POST['tva_tx']; - $desc=$_POST['np_desc']; + $desc=$_POST['dp_desc']; } $result = $commande->addline( @@ -1556,12 +1556,12 @@ else if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS_PERSO) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('np_desc','',100,'dolibarr_details'); + $doleditor=new DolEditor('dp_desc','',100,'dolibarr_details'); $doleditor->Create(); } else { - print ''; + print ''; } print ''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index fe308c4c8d8..73447b456a6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -723,7 +723,7 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer) */ if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') && $user->rights->facture->creer) { - if ($_POST['qty'] && (($_POST['pu']!='' && $_POST['np_desc']) || $_POST['idprod'])) + if ($_POST['qty'] && (($_POST['pu']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) { $fac = new Facture($db); $ret=$fac->fetch($_POST['facid']); @@ -810,7 +810,7 @@ if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') && { $pu_ht=$_POST['pu']; $tva_tx=$_POST['tva_tx']; - $desc=$_POST['np_desc']; + $desc=$_POST['dp_desc']; } // Insere ligne @@ -2480,12 +2480,12 @@ else if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS_PERSO) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('np_desc','',100,'dolibarr_details'); + $doleditor=new DolEditor('dp_desc','',100,'dolibarr_details'); $doleditor->Create(); } else { - print ''; + print ''; } print ''; print '';