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

Fix regression

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-20 22:24:06 +02:00
parent fb74bbc204
commit 462a3b17c2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -948,15 +948,14 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
var discount = parseFloat($('option:selected', this).attr('data-discount')); var discount = parseFloat($('option:selected', this).attr('data-discount'));
if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));} if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));}
var tva_tx = parseFloat($('option:selected', this).data('tvatx')); /* var tva_tx = $('option:selected', this).data('tvatx'); */
console.log("We find supplier price :"+up+" qty: "+qty+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val()); console.log("We find supplier price :"+up+" qty: "+qty+" tva_tx="+tva_tx+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
jQuery("#price_ht").val(up); jQuery("#price_ht").val(up);
$('#tva_tx option').removeAttr('selected').filter('[value='+tva_tx+']').prop('selected', true); /* $('#tva_tx option').removeAttr('selected').filter('[value='+tva_tx+']').prop('selected', true); */
if (jQuery("#qty").val() < qty) if (jQuery("#qty").val() < qty) {
{
jQuery("#qty").val(qty); jQuery("#qty").val(qty);
} }
if (jQuery("#remise_percent").val() < discount) if (jQuery("#remise_percent").val() < discount)