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

Fix sconto su importi negativi

This commit is contained in:
MatteoPistorello 2022-10-06 16:03:04 +02:00
parent 818aade69c
commit ce4e8e606c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.php
View File

@ -138,7 +138,7 @@ function discountInfo(Accounting $riga, $mostra_maggiorazione = true)
return null;
}
$text = $riga->sconto_unitario > 0 ? tr('sconto _TOT_ _TYPE_') : tr('maggiorazione _TOT__TYPE_');
$text = ($riga->prezzo_unitario > 0 && $riga->sconto_unitario > 0) || ($riga->prezzo_unitario < 0 && $riga->sconto_unitario < 0) ? tr('sconto _TOT_ _TYPE_') : tr('maggiorazione _TOT__TYPE_');
$totale = !empty($riga->sconto_percentuale) ? $riga->sconto_percentuale : $riga->sconto_unitario_corrente;
return replace($text, [

6
src/Common/Components/Accounting.php
View File

@ -175,11 +175,7 @@ abstract class Accounting extends Component
*/
public function getTotaleImponibileAttribute()
{
$result = $this->prezzo_unitario >= 0 ? $this->imponibile : -$this->imponibile;
$result -= $this->sconto;
return $this->prezzo_unitario >= 0 ? $result : -$result;
return $this->imponibile - $this->sconto;
}
/**