loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-13 10:00:49 +01:00
Code Issues Releases Activity

Miglioramenti minori

Browse Source
This commit is contained in:
Thomas Zilio 2018-10-05 10:49:46 +02:00
parent 0047be3679
commit 73bed68b86
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/articoli/src/Articolo.php
View File

@ -3,7 +3,7 @@
namespace Modules\Articoli;
use Base\Model;
use Modules\Articoli\Articolo as ArticoloIntervento;
use Modules\Interventi\Articolo as ArticoloIntervento;
class Articolo extends Model
{

7
modules/fatture/actions.php
View File

@ -574,7 +574,12 @@ switch (post('op')) {
break;
case 'manage_descrizione':
$riga = Descrizione::make($fattura);
if (post('idriga') != null) {
$riga = Descrizione::find(post('idriga'));
} else {
$riga = Descrizione::make($fattura);
}
$riga->descrizione = post('descrizione');
$riga->save();

6
modules/fatture/row-edit.php
View File

@ -25,10 +25,10 @@ $options = [
];
// Dati della riga
$rsr = $dbo->fetchArray('SELECT * FROM co_righe_documenti WHERE iddocumento='.prepare($id_record).' AND id='.prepare(get('idriga')));
$riga = $dbo->fetchOne('SELECT * FROM co_righe_documenti WHERE iddocumento='.prepare($id_record).' AND id='.prepare(get('idriga')));
$result = $rsr[0];
$result['prezzo'] = $rsr[0]['subtotale'] / $rsr[0]['qta'];
$result = $riga;
$result['prezzo'] = $riga['subtotale'] / $riga['qta'];
// Importazione della gestione dedicata
$file = 'riga';

15
src/base/Row.php
View File

@ -53,9 +53,16 @@ abstract class Row extends Description
{
$this->attributes['idrivalsainps'] = $value;
// Calcolo rivalsa inps
$rivalsa = database()->fetchOne('SELECT * FROM co_rivalsainps WHERE id = '.prepare($value));
$this->rivalsainps = ($this->subtotale - $this->sconto) / 100 * $rivalsa['percentuale'];
$this->fixRivalsaINPS();
}
/**
* Effettua i conti per la Rivalsa INPS.
*/
protected function fixRivalsaINPS()
{
$rivalsa = database()->fetchOne('SELECT * FROM co_rivalsainps WHERE id = '.prepare($this->idrivalsainps));
$this->attributes['rivalsainps'] = ($this->subtotale - $this->sconto) / 100 * $rivalsa['percentuale'];
}
/**
@ -230,5 +237,7 @@ abstract class Row extends Description
$this->attributes['subtotale'] = $this->costo_unitario * $this->qta;
$this->fixIva();
$this->fixRitenutaAcconto();
$this->fixRivalsaINPS();
}
}