Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not

Browse Source 
usable.
This commit is contained in:
Laurent Destailleur 2016-09-10 18:19:54 +02:00
parent 72600a521d
commit 49e54d55d5
4 changed files with 6 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/comm/propal/card.php
View File

@ -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 '<input type="hidden" name="createmode" value="empty">';
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<br><table>';
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
{
print '<br><table>';
// For backward compatibility
print '<tr>';
print '<td><input type="radio" name="createmode" value="copy"></td>';
@ -1558,42 +1549,11 @@ if ($action == 'create')
}
print '</td></tr>';
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
print '<tr><td colspan="3">&nbsp;</td></tr>';
print '<tr><td valign="top"><input type="radio" name="createmode" value="empty" checked></td>';
print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyPropal") . '</td></tr>';
}
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
{
print '<tr><td colspan="3">';
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
$lib = $langs->trans("ProductsAndServices");
print '<table class="border" width="100%">';
print '<tr>';
print '<td>' . $lib . '</td>';
print '<td>' . $langs->trans("Qty") . '</td>';
print '<td>' . $langs->trans("ReductionShort") . '</td>';
print '</tr>';
for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++) {
print '<tr><td>';
// multiprix
if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
$form->select_produits('', "idprod" . $i, '', $conf->product->limit_size, $soc->price_level);
else
$form->select_produits('', "idprod" . $i, '', $conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="2" name="qty' . $i . '" value="1"></td>';
print '<td><input type="text" size="2" name="remise' . $i . '" value="' . $soc->remise_percent . '">%</td>';
print '</tr>';
}
print "</table>";
}
print '</td></tr>';
}
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table>';
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '</table>';
dol_fiche_end();

32
htdocs/commande/card.php
View File

@ -1702,38 +1702,6 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
}
}
else
{
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
{
/*
* Services/produits predefinis
*/
$NBLINES = 8;
print '<tr><td colspan="3">';
print '<table class="noborder">';
print '<tr><td>' . $langs->trans('ProductsAndServices') . '</td>';
print '<td>' . $langs->trans('Qty') . '</td>';
print '<td>' . $langs->trans('ReductionShort') . '</td>';
print '</tr>';
for($i = 1; $i <= $NBLINES; $i ++) {
print '<tr><td>';
// multiprix
if (! empty($conf->global->PRODUIT_MULTIPRICES))
print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size, $soc->price_level);
else
print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="3" name="qty' . $i . '" value="1"></td>';
print '<td><input type="text" size="3" name="remise_percent' . $i . '" value="' . $soc->remise_percent . '">%</td></tr>';
}
print '</table>';
print '</td></tr>';
}
}
print '</table>';

29
htdocs/fourn/facture/card.php
View File

@ -1455,35 +1455,6 @@ if ($action == 'create')
print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
}
}
else
{
// TODO more bugs
if (1==2 && ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
{
print '<tr class="liste_titre">';
print '<td>&nbsp;</td>';
print '<td>'.$langs->trans('Label').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
print '</tr>';
for ($i = 1 ; $i < 9 ; $i++)
{
$value_qty = '1';
$value_tauxtva = '';
print '<tr><td>'.$i.'</td>';
print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
print '<td align="right"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
print '<td align="right">';
print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
print '</td>';
print '<td align="right"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
print '<td align="right"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
}
}
}
// Other options
$parameters=array('colspan' => ' colspan="6"');

46
htdocs/supplier_proposal/card.php
View File

@ -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 '<input type="hidden" name="createmode" value="empty">';
if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<br><table>';
if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE))
{
print '<br><table>';
// For backward compatibility
print '<tr>';
print '<td><input type="radio" name="createmode" value="copy"></td>';
@ -1242,42 +1233,11 @@ if ($action == 'create')
}
print '</td></tr>';
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
print '<tr><td colspan="3">&nbsp;</td></tr>';
print '<tr><td valign="top"><input type="radio" name="createmode" value="empty" checked></td>';
print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyAsk") . '</td></tr>';
}
if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
{
print '<tr><td colspan="3">';
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
$lib = $langs->trans("ProductsAndServices");
print '<table class="border" width="100%">';
print '<tr>';
print '<td>' . $lib . '</td>';
print '<td>' . $langs->trans("Qty") . '</td>';
print '<td>' . $langs->trans("ReductionShort") . '</td>';
print '</tr>';
for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++) {
print '<tr><td>';
// multiprix
if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
$form->select_produits('', "idprod" . $i, '', $conf->product->limit_size, $soc->price_level);
else
$form->select_produits('', "idprod" . $i, '', $conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="2" name="qty' . $i . '" value="1"></td>';
print '<td><input type="text" size="2" name="remise' . $i . '" value="' . $soc->remise_percent . '">%</td>';
print '</tr>';
}
print "</table>";
}
print '</td></tr>';
}
if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table>';
if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '</table>';
dol_fiche_end();