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

Merge pull request #22399 from Ants-In/fix21543

Browse Source 
FIX #21543
This commit is contained in:
Laurent Destailleur 2022-09-25 12:13:09 +02:00 committed by GitHub
commit 35c296b00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -952,13 +952,15 @@ 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 = $('option:selected', this).data('tvatx'); */ var tva_tx = $('option:selected', this).data('tvatx'); /* FIX21543 */
console.log("We find supplier price :"+up+" qty: "+qty+" tva_tx="+tva_tx+" 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); */
$('#tva_tx option').val(tva_tx); /* FIX21543 */
if (jQuery("#qty").val() < qty) { if (jQuery("#qty").val() < qty) {
jQuery("#qty").val(qty); jQuery("#qty").val(qty);
} }