diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 82223887b91..d045c5f0ea7 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -352,16 +352,6 @@ if (empty($reshook))
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
}
- for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
- {
- if ($_POST['idprod' . $i]) {
- $xid = 'idprod' . $i;
- $xqty = 'qty' . $i;
- $xremise = 'remise' . $i;
- $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
- }
- }
-
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
if ($ret < 0) {
@@ -1523,9 +1513,10 @@ if ($action == 'create')
if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '';
- if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
';
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
{
+ print '
';
+ if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '
';
dol_fiche_end();
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 25e6606c16c..def950305d6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1702,38 +1702,6 @@ if ($action == 'create' && $user->rights->commande->creer)
print '| ' . $langs->trans('MulticurrencyTotalTTC') . ' | ' . price($objectsrc->multicurrency_total_ttc) . " |
";
}
}
- else
- {
- if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
- {
- /*
- * Services/produits predefinis
- */
- $NBLINES = 8;
-
- print '| ';
-
- print '';
- print ' |
';
- }
- }
print '';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 7f7cbdf44eb..a64d4115186 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1455,35 +1455,6 @@ if ($action == 'create')
print '| ' . $langs->trans('MulticurrencyTotalTTC') . ' | ' . price($objectsrc->multicurrency_total_ttc) . " |
";
}
}
- else
- {
- // TODO more bugs
- if (1==2 && ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
- {
- print '';
- print '| | ';
- print ''.$langs->trans('Label').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('Qty').' | ';
- print ''.$langs->trans('PriceUTTC').' | ';
- print '
';
-
- for ($i = 1 ; $i < 9 ; $i++)
- {
- $value_qty = '1';
- $value_tauxtva = '';
- print '| '.$i.' | ';
- print ' | ';
- print ' | ';
- print '';
- print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
- print ' | ';
- print ' | ';
- print ' |
';
- }
- }
- }
// Other options
$parameters=array('colspan' => ' colspan="6"');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 30700695b00..839ce87f945 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -282,16 +282,6 @@ if (empty($reshook))
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
}
- for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
- {
- if ($_POST['idprod' . $i]) {
- $xid = 'idprod' . $i;
- $xqty = 'qty' . $i;
- $xremise = 'remise' . $i;
- $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
- }
- }
-
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
if ($ret < 0) {
@@ -1207,9 +1197,10 @@ if ($action == 'create')
if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '';
- if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '
';
if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE))
{
+ print '
';
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '
';
dol_fiche_end();