diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php index 53754ff85cb..58474fa1b24 100644 --- a/htdocs/admin/produit.php +++ b/htdocs/admin/produit.php @@ -99,10 +99,6 @@ else if ($_POST["action"] == 'sousproduits') dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]); } } -else if ($_POST["action"] == 'changeproductdesc') -{ - dolibarr_set_const($db, "PRODUIT_CHANGE_PROD_DESC", $_POST["activate_changeproductdesc"]); -} else if ($_POST["action"] == 'viewProdDescInForm') { dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $_POST["activate_viewProdDescInForm"]); @@ -232,23 +228,6 @@ else print ''; print ''; - -// Modification description produit activation/desactivation -/* Cet option ne doit pas exister. Les description de lignes doivent toujours etre modifiable. -$var=!$var; -print "
"; -print ""; -print ""; -print ''.$langs->trans("ModifyProductDescAbility").''; -print ''; -print $html->selectyesno("activate_changeproductdesc",$conf->global->PRODUIT_CHANGE_PROD_DESC,1); -print ''; -print ''; -print ""; -print ''; -print '
'; -*/ - // Visualiser description produit dans les formulaires activation/desactivation $var=!$var; print "
"; diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index cfae2ed2a2a..b5dffcc891e 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2006 Laurent Destailleur - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5d366f94445..047b3d33aaa 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1502,19 +1502,16 @@ if ($_GET['propalid'] > 0) } if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; - if (! $conf->global->PRODUIT_CHANGE_PROD_DESC) + // éditeur wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS_PERSO) { - // éditeur wysiwyg - 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->Create(); - } - else - { - print ''; - } + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + $doleditor=new DolEditor('np_desc','',100,'dolibarr_details'); + $doleditor->Create(); + } + else + { + print ''; } print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index fab72dab264..40d24832d2c 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1621,21 +1621,18 @@ else } if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; - - if (! $conf->global->PRODUIT_CHANGE_PROD_DESC) - { - // éditeur wysiwyg - 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->Create(); - } - else - { - print ''; - } - } + + // éditeur wysiwyg + 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->Create(); + } + else + { + print ''; + } print ''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 26b8b0a0013..67e59699957 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2638,19 +2638,16 @@ else if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '
'; - if (! $conf->global->PRODUIT_CHANGE_PROD_DESC) + // éditeur wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS_PERSO) { - // éditeur wysiwyg - 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->Create(); - } - else - { - print ''; - } + require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); + $doleditor=new DolEditor('np_desc','',100,'dolibarr_details'); + $doleditor->Create(); + } + else + { + print ''; } print ''; diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index 91ac444405b..1da4a3f2020 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -241,13 +241,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $libelleproduitservice=$outputlangs->transnoentities("Product")." ".$com->lignes[$i]->ref_fourn." - ".$libelleproduitservice; // Ajoute description du produit - if ($conf->global->PRODUIT_DESC_IN_FORM && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($com->lignes[$i]->product_desc&&$com->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$com->lignes[$i]->product_desc!=$com->lignes[$i]->desc) { - if ($com->lignes[$i]->product_desc&&$com->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$com->lignes[$i]->product_desc!=$com->lignes[$i]->desc) - { - if ($libelleproduitservice) $libelleproduitservice.="\n"; - $libelleproduitservice.=$com->lignes[$i]->product_desc; - } + if ($libelleproduitservice) $libelleproduitservice.="\n"; + $libelleproduitservice.=$com->lignes[$i]->product_desc; } } if ($com->lignes[$i]->date_start && $com->lignes[$i]->date_end) diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php index ac96f40d648..9bf52e0397c 100644 --- a/htdocs/includes/modules/modProduit.class.php +++ b/htdocs/includes/modules/modProduit.class.php @@ -80,20 +80,13 @@ class modProduit extends DolibarrModules // Constantes $this->const = array(); $r=0; - - $this->const[$r][0] = "PRODUIT_CHANGE_PROD_DESC"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "0"; - $this->const[$r][3] = "Mettre à 1 pour permettre modification de description d'un produit dans une propale, commande et facture"; - $this->const[$r][4] = 1; - $r++; $this->const[$r][0] = "MAIN_SEARCHFORM_PRODUITSERVICE"; $this->const[$r][1] = "yesno"; $this->const[$r][2] = "1"; $this->const[$r][3] = "Affichage formulaire de recherche des Produits et Services dans la barre de gauche"; $this->const[$r][4] = 0; - $r++; + $r++; // Boxes $this->boxes = array(); diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 4f9e007d6f9..a32358bc823 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -142,16 +142,8 @@ class Propal extends CommonObject { $prod=new Product($this->db); $prod->fetch($idproduct); - - // on ajoute la description du produit si l'option est active - if ($conf->global->PRODUIT_CHANGE_PROD_DESC) - { - $productdesc = $prod->description; - } - else - { - $productdesc = ''; - } + + $productdesc = $prod->description; $tva_tx = get_default_tva($mysoc,$this->client,$prod->tva_tx); // multiprix diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 61e46a0ec94..3ea98fcb4ec 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -1162,3 +1162,5 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_factur -- V4.1 update llx_facture set total_ttc = NULL where rowid in (select fk_facture from llx_facturedet where description = '(CREDIT_NOTE)'); -- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)'); -- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)'; + +DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC'; \ No newline at end of file