|
@@ -948,15 +948,14 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
|
|
|
var discount = parseFloat($('option:selected', this).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);
|
|
|
- $('#tva_tx option').removeAttr('selected').filter('[value='+tva_tx+']').prop('selected', true);
|
|
|
-
|
|
|
- if (jQuery("#qty").val() < qty)
|
|
|
- {
|
|
|
+ /* $('#tva_tx option').removeAttr('selected').filter('[value='+tva_tx+']').prop('selected', true); */
|
|
|
+
|
|
|
+ if (jQuery("#qty").val() < qty) {
|
|
|
jQuery("#qty").val(qty);
|
|
|
}
|
|
|
if (jQuery("#remise_percent").val() < discount)
|