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

FIX autocalculation of the supplier price in main currency.

Browse Source 
Conflicts:
	htdocs/product/fournisseurs.php
This commit is contained in:
Laurent Destailleur 2021-09-16 13:17:00 +02:00
parent 68bc85124b
commit 87bb971d75
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
htdocs/product/fournisseurs.php
View File

@ -616,17 +616,19 @@ if ($id > 0 || $ref)
</script>'; </script>';
} }
if ($conf->multicurrency->enabled) { if (!empty($conf->multicurrency->enabled)) {
// Currency // Currency
print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
print '<td>'; print '<td>';
$currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : ''); $currencycodetouse = GETPOST('multicurrency_code') ? GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency; if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) {
print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1); $currencycodetouse = $conf->currency;
print ' &nbsp; '.$langs->trans("CurrencyRate").' '; }
print '<input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">'; print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
print '</td>'; print ' &nbsp; '.$langs->trans("CurrencyRate").' ';
print '</tr>'; print '<input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ? GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
print '</td>';
print '</tr>';
// Currency price qty min // Currency price qty min
print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
@ -646,43 +648,45 @@ if ($id > 0 || $ref)
print '</td></tr>'; print '</td></tr>';
$currencies = array(); $currencies = array();
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity; $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.((int) $conf->entity);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$currency = new MultiCurrency($db); $currency = new MultiCurrency($db);
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
$currency->fetch($obj->rowid); $currency->fetch($obj->rowid);
$currencies[$currency->code] = $currency->rate->rate; $currencies[$currency->code] = ((float) $currency->rate->rate);
} }
} }
$currencies = json_encode($currencies); $currencies = json_encode($currencies);
print <<<SCRIPT print <<<END
<!-- javascript to autocalculate the minimum price -->
<script type="text/javascript"> <script type="text/javascript">
function update_price_from_multicurrency() { function update_price_from_multicurrency() {
var multicurrency_price = $('input[name="multicurrency_price"]').val(); console.log("update_price_from_multicurrency");
var multicurrency_tx = $('input[name="multicurrency_tx"]').val(); var multicurrency_price = price2numjs($('input[name="multicurrency_price"]').val());
$('input[name="price"]').val(multicurrency_price / multicurrency_tx); var multicurrency_tx = price2numjs($('input[name="multicurrency_tx"]').val());
$('input[name="disabled_price"]').val(multicurrency_price / multicurrency_tx); if (multicurrency_tx != 0) {
$('input[name="price"]').val(multicurrency_price / multicurrency_tx);
$('input[name="disabled_price"]').val(multicurrency_price / multicurrency_tx);
} else {
$('input[name="price"]').val('');
$('input[name="disabled_price"]').val('');
}
} }
jQuery(document).ready(function () { jQuery(document).ready(function () {
$('input[name="disabled_price"]').prop('disabled', true); $('input[name="disabled_price"]').prop('disabled', true);
$('select[name="disabled_price_base_type"]').prop('disabled', true); $('select[name="disabled_price_base_type"]').prop('disabled', true);
update_price_from_multicurrency(); update_price_from_multicurrency();
$('input[name="multicurrency_price"]').keyup(function () { $('input[name="multicurrency_price"], input[name="multicurrency_tx"]').keyup(function () {
update_price_from_multicurrency();
}).change(function () {
update_price_from_multicurrency();
}).on('paste', function () {
update_price_from_multicurrency(); update_price_from_multicurrency();
}); });
$('input[name="multicurrency_price"], input[name="multicurrency_tx"]').change(function () {
$('input[name="multicurrency_tx"]').keyup(function () {
update_price_from_multicurrency(); update_price_from_multicurrency();
}).change(function () { });
update_price_from_multicurrency(); $('input[name="multicurrency_price"], input[name="multicurrency_tx"]').on('paste', function () {
}).on('paste', function () {
update_price_from_multicurrency(); update_price_from_multicurrency();
}); });
@ -693,11 +697,13 @@ if ($id > 0 || $ref)
var currencies_array = $currencies; var currencies_array = $currencies;
$('select[name="multicurrency_code"]').change(function () { $('select[name="multicurrency_code"]').change(function () {
console.log("We change the currency");
$('input[name="multicurrency_tx"]').val(currencies_array[$(this).val()]); $('input[name="multicurrency_tx"]').val(currencies_array[$(this).val()]);
update_price_from_multicurrency();
}); });
}); });
</script> </script>
SCRIPT; END;
} else { } else {
// Price qty min // Price qty min
print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';