lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed JS compatibility with multiprices price generator

Browse Source
This commit is contained in:
Marcos García de La Fuente 2015-11-08 16:54:54 +01:00
parent 9bc4b9f0bc
commit 9cdf45e0a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/product/price.php
View File

@ -929,8 +929,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
<script> <script>
var showHidePriceRules = function () { var showHidePriceRules = function () {
var otherPrices = $('div.fiche form table:not(:first), div.fiche form table:first tr:not(:first)'); var otherPrices = $('div.fiche form table tbody tr:not(:first)');
var minPrice1 = $('div.fiche form:first tr:eq(1)'); var minPrice1 = $('div.fiche form input[name="price_min[1]"]');
if (jQuery('input#usePriceRules').prop('checked')) { if (jQuery('input#usePriceRules').prop('checked')) {
otherPrices.hide(); otherPrices.hide();
@ -959,7 +959,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
} }
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr class="liste_titre"> print '<thead><tr class="liste_titre">
<td style="text-align: center">'.$langs->trans("PriceLevel").'</td>'; <td style="text-align: center">'.$langs->trans("PriceLevel").'</td>';
if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) { if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
print '<td style="text-align: center">'.$langs->trans("VATRate").'</td>'; print '<td style="text-align: center">'.$langs->trans("VATRate").'</td>';
@ -969,7 +969,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
print '<td></td>'; print '<td></td>';
} }
print '</tr>'; print '</tr></thead><tbody>';
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
$var = !$var; $var = !$var;
@ -1015,7 +1015,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
print '</tr>'; print '</tr>';
} }
print '</table><br><div style="text-align: center">'; print '</tbody></table><br><div style="text-align: center">';
print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">'; print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
print '&nbsp;&nbsp;&nbsp;'; print '&nbsp;&nbsp;&nbsp;';
print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>'; print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';