loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/devcode-it/openstamanager

Browse Source
This commit is contained in:
MatteoPistorello
2022-07-13 17:58:39 +02:00
parent 7069436f20 ed66cf50d4
commit fbc043feb7
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
assets/src/css/style.css
View File

@@ -30,7 +30,11 @@
url('../fonts/sourcesanspro-regular-webfont.svg') format('svg'); url('../fonts/sourcesanspro-regular-webfont.svg') format('svg');
} }
html, html{
font-size: 13px;
height: 100%;
}
body { body {
font-family: sans-serif, "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-family: sans-serif, "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 1rem; font-size: 1rem;
@@ -38,11 +42,6 @@ body {
line-height: 1.5; line-height: 1.5;
color: #212529; color: #212529;
text-align: left; text-align: left;
/*background-color: #fff;*/
}
html {
height: 100%;
} }
textarea { textarea {

2
lib/functions.php
View File

@@ -243,7 +243,7 @@ function translateTemplate()
// Informazioni estese sulle azioni dell'utente // Informazioni estese sulle azioni dell'utente
$op = post('op'); $op = post('op');
if (!empty($op)) { if (!empty($op) && $op != 'summable-results') {
OperationLog::setInfo('id_module', $id_module); OperationLog::setInfo('id_module', $id_module);
OperationLog::setInfo('id_plugin', $id_plugin); OperationLog::setInfo('id_plugin', $id_plugin);
OperationLog::setInfo('id_record', $id_record); OperationLog::setInfo('id_record', $id_record);

2
modules/fatture/src/Gestori/Bollo.php
View File

@@ -48,7 +48,7 @@ class Bollo
} }
$righe_bollo = $this->fattura->getRighe()->filter(function ($item, $key) { $righe_bollo = $this->fattura->getRighe()->filter(function ($item, $key) {
return $item->aliquota != null && in_array($item->aliquota->codice_natura_fe, ['N1', 'N2.1', 'N2.2', 'N3.1', 'N3.2', 'N3.3', 'N3.4', 'N3.5', 'N3.6', 'N4']); return $item->aliquota != null && in_array($item->aliquota->codice_natura_fe, ['N2.1', 'N2.2', 'N3.5', 'N3.6', 'N4']);
}); });
$importo_righe_bollo = $righe_bollo->sum('totale_imponibile'); $importo_righe_bollo = $righe_bollo->sum('totale_imponibile');