diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 09ed1aead..15049af34 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -1096,3 +1096,13 @@ div.tip { -ms-user-select: none; user-select: none; } + + +.table-extra-condensed > thead > tr > th, +.table-extra-condensed > tbody > tr > th, +.table-extra-condensed > tfoot > tr > th, +.table-extra-condensed > thead > tr > td, +.table-extra-condensed > tbody > tr > td, +.table-extra-condensed > tfoot > tr > td { + padding: 2px; +} \ No newline at end of file diff --git a/include/common/articolo.php b/include/common/articolo.php index ad09a52ac..936477f63 100755 --- a/include/common/articolo.php +++ b/include/common/articolo.php @@ -267,7 +267,7 @@ function verificaPrezzoArticolo() { let div = prezzo_unitario_input.closest("div").parent().find("div[id*=errors]"); - if (prezzo_previsto === prezzo_unitario) { + if (prezzo_previsto === prezzo_unitario || prezzo_previsto === 0 ) { div.css("padding-top", "0"); div.html(""); @@ -275,7 +275,7 @@ function verificaPrezzoArticolo() { } div.css("padding-top", "5px"); - div.html(`'.tr('Prezzo suggerito').': ` + prezzo_previsto.toLocale() + globals.currency + ``); + div.html(`'.tr('Prezzo suggerito').': ` + prezzo_previsto.toLocale() + " " + globals.currency + ``); } /** @@ -297,7 +297,7 @@ function verificaScontoArticolo() { } div.css("padding-top", "5px"); - div.html(`'.tr('Sconto suggerito').': ` + sconto_previsto.toLocale() + `%`); + div.html(`'.tr('Sconto suggerito').': ` + sconto_previsto.toLocale() + `%`); } /** diff --git a/include/common/barcode.php b/include/common/barcode.php index 54ded6559..458697c8d 100644 --- a/include/common/barcode.php +++ b/include/common/barcode.php @@ -268,7 +268,7 @@ function verificaPrezzoArticolo(tr) { let div = prezzo_unitario_input.closest("div").parent().find("div[id*=errors]"); - if (prezzo_previsto === prezzo_unitario) { + if (prezzo_previsto === prezzo_unitario || prezzo_previsto === 0) { div.css("padding-top", "0"); div.html(""); @@ -276,7 +276,7 @@ function verificaPrezzoArticolo(tr) { } div.css("padding-top", "5px"); - div.html(`'.tr('Prezzo suggerito').': ` + prezzo_previsto.toLocale() + globals.currency + ``); + div.html(`'.tr('Prezzo suggerito').': ` + prezzo_previsto.toLocale() + " " + globals.currency + ``); } /** @@ -314,7 +314,7 @@ function verificaScontoArticolo(tr) { } div.css("padding-top", "5px"); - div.html(`'.tr('Sconto suggerito').': ` + sconto_previsto.toLocale() + `%`); + div.html(`'.tr('Sconto suggerito').': ` + sconto_previsto.toLocale() + `%`); } /** diff --git a/include/common/riga.php b/include/common/riga.php index 5e2306661..8b6706ec7 100755 --- a/include/common/riga.php +++ b/include/common/riga.php @@ -76,7 +76,7 @@ if ($options['dir'] == 'entrata') { var mediaponderata = parseFloat($("#idarticolo").selectData().media_ponderata); - div.html("
\ '.tr('Guadagno').':\ @@ -84,7 +84,7 @@ if ($options['dir'] == 'entrata') { | \ " + guadagno.toLocale() + "\ | \ -\ + | \ " + globals.currency + "\ | \\ " + margine.toLocale() + "\ | \ -\ + | \ %\ | \ \ @@ -106,7 +106,7 @@ if ($options['dir'] == 'entrata') {\ " + mediaponderata.toLocale() + "\ | \ -\ + | \ " + globals.currency + "\ | \ \ @@ -160,7 +160,7 @@ if (in_array($module['name'], ['Ordini cliente', 'Ordini fornitore', 'Preventivi $confermato = $result['confermato']; } echo ' -