From 6e8a6eca7a4dbdb57251e4c1e27dc9bbb0f0c3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 5 Nov 2015 13:05:08 +0100 Subject: [PATCH] Fixed feature malfunction caused by commit a161e6d47a687e348de4c416a02fbee2b6deaa81 and previous changes --- htdocs/product/price.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 8822fd9f7f4..15a9d205a9e 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -895,7 +895,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> var showHidePriceRules = function () { var otherPrices = $('div.fiche form:not(:first)'); - var minPrice1 = $('div.fiche form:first tr:eq(3)'); + var minPrice1 = $('div.fiche form:first tr:eq(1)'); if (jQuery('input#usePriceRules').prop('checked')) { otherPrices.hide(); @@ -914,16 +914,14 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) - { - print $langs->trans('UseMultipriceRules'). ' price_autogen ? 'checked' : '').'>

'; - } - for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { print '
'; if ($i > 1) print '
'; + elseif (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) { + print $langs->trans('UseMultipriceRules'). ' price_autogen ? 'checked' : '').'>

'; + } print ''; print ''; print '';