diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index fb8cede822665f446d603455b5c9f3805fa75b1b..9732eff4e43ec21e2b02c254dfae738a99e4889c 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -98,11 +98,6 @@ if ($_POST["action"] == 'set_PROPALE_FREE_TEXT') dolibarr_set_const($db, "PROPALE_FREE_TEXT",$_POST["PROPALE_FREE_TEXT"],'chaine',0,'',$conf->entity); } -if ($_POST["action"] == 'setnbprod') -{ - dolibarr_set_const($db, "PROPALE_NEW_FORM_NB_PRODUCT",$_POST["value"],'chaine',0,'',$conf->entity); -} - if ($_POST["action"] == 'setdefaultduration') { dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION",$_POST["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 4d6718a0915c385693f12b668f76da9040032f0a..dd5a6c49452bbac7eed777c73b747eab4a20fd80 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -288,7 +288,7 @@ if ($_GET["action"] == 'create') print '<td>'.$langs->trans("Qty").'</td>'; print '<td>'.$langs->trans("ReductionShort").'</td>'; print '</tr>'; - for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++) + for ($i = 1 ; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i++) { print '<tr><td>'; // multiprix diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 9648fb703ad89b6cd799b7ff27ee0aaefc3c89e8..bb8492894e4ff97d2b6118787a361bb88fa00fdc 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -281,7 +281,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer) $propal->origin = $_POST['origin']; $propal->origin_id = $_POST['originid']; - for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++) + for ($i = 1 ; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i++) { if ($_POST['idprod'.$i]) { diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 6f98527a6ed570703588bbf1a32639d7ef10b34b..d7eaada15c3e7d55260b625a5ea5859f5f19d743 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -276,8 +276,6 @@ class Conf $this->mantis->db->user=defined('PHPMANTIS_USER')?PHPMANTIS_USER:''; $this->mantis->db->pass=defined('PHPMANTIS_PASS')?PHPMANTIS_PASS:''; $this->mantis->db->name=defined('PHPMANTIS_DBNAME')?PHPMANTIS_DBNAME:''; - // Module propal - if (! defined("PROPALE_NEW_FORM_NB_PRODUCT")) define("PROPALE_NEW_FORM_NB_PRODUCT", 4); // Module oscommerce 1 $this->boutique->livre->enabled=defined("BOUTIQUE_LIVRE")?BOUTIQUE_LIVRE:0; $this->boutique->album->enabled=defined("BOUTIQUE_ALBUM")?BOUTIQUE_ALBUM:0;