loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix minori

This commit is contained in:
Thomas Zilio 2020-07-03 16:28:11 +02:00
parent 4d4c6a5634
commit 62dad5f3b9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common/riga.php
View File

@ -51,11 +51,11 @@ if ($options['dir'] == 'entrata') {
}
var guadagno = prezzo - sconto - costo_unitario;
var margine = (((prezzo - sconto)*100)/prezzo_acquisto)-100;
var margine = (((prezzo - sconto) * 100) / costo_unitario) - 100;
var parent = $("#costo_unitario").closest("div").parent();
var div = parent.find("div[id*=\"errors\"]");
div.html("<small>'.tr('Guadagno').': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; '.tr('Margine').': " + margine.toLocale() + " %</small>");
div.html("<small>' . tr('Guadagno') . ': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; ' . tr('Margine') . ': " + margine.toLocale() + " %</small>");
if (guadagno < 0) {
parent.addClass("has-error");
div.addClass("text-danger").removeClass("text-success");

3
include/common/sconto.php
View File

@ -55,7 +55,8 @@ echo '
}
function aggiorna_sconto_unitario(){
var msg = sconto_unitario.val().toEnglish() >= 0 ? "'.tr('Sconto unitario').'" : "'.tr('Maggiorazione unitaria').'";
var sconto = sconto_unitario.val().toEnglish();
var msg = sconto >= 0 ? "'.tr('Sconto unitario').'" : "'.tr('Maggiorazione unitaria').'";
sconto_percentuale.val(0);