From 982be7db0413137155187d166501e0e3d95e60e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 2 Jun 2010 08:43:35 +0000
Subject: [PATCH] Qual: Removed old deprecated constant
---
htdocs/admin/propale.php | 5 -----
htdocs/comm/addpropal.php | 2 +-
htdocs/comm/propal.php | 2 +-
htdocs/core/class/conf.class.php | 2 --
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index fb8cede8226..9732eff4e43 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 4d6718a0915..dd5a6c49452 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 9648fb703ad..bb8492894e4 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 6f98527a6ed..d7eaada15c3 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;
--
GitLab