Compare commits
No commits in common. "211e1f279f967012f55f6c16cc0bc43da160f129" and "dbc274a1b72dad2a970c4d43f17469e13e820e1b" have entirely different histories.
211e1f279f
...
dbc274a1b7
|
|
@ -195,10 +195,6 @@ a:focus {
|
|||
margin: 7% auto
|
||||
}
|
||||
|
||||
.card-center-medium {
|
||||
margin: 7% auto
|
||||
}
|
||||
|
||||
.box-center .box-body,
|
||||
.box-center-large .box-body {
|
||||
padding: 20px;
|
||||
|
|
@ -311,6 +307,10 @@ span.form-control {
|
|||
padding: 5px;
|
||||
}
|
||||
|
||||
.input-group .input-group-addon {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.input-group-addon {
|
||||
padding: 3px 12px;
|
||||
}
|
||||
|
|
@ -1068,7 +1068,6 @@ kbd{
|
|||
.login-page{
|
||||
background: #ccc;
|
||||
background: radial-gradient(circle, rgba(255,255,255,1) 0%, rgba(229,229,229,1) 34%, rgba(204,204,204,1) 100%);
|
||||
display: block;
|
||||
}
|
||||
|
||||
.icon{
|
||||
|
|
|
|||
|
|
@ -148,7 +148,10 @@ if (!$has_user) {
|
|||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
{[ "type": "text", "label": "'.tr('Username').'", "id": "admin_username", "name": "admin_username", "value": "", "placeholder": "'.tr("Imposta lo username dell'amministratore").'", "required": 1]}
|
||||
<div class="form-group">
|
||||
<label for="admin_username">'.tr('Username').'</label>
|
||||
<input type="text" class="form-control" id="admin_username" name="admin_username" placeholder="'.tr("Imposta l'username dell'amministratore").'" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
|
|
@ -156,7 +159,10 @@ if (!$has_user) {
|
|||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
{[ "type": "text", "label": "'.tr('Email').'", "id": "admin_email", "name": "admin_email", "value": "", "placeholder": "'.tr("Imposta l'indirizzo email dell'amministratore").'", "required": 1]}
|
||||
<div class="form-group">
|
||||
<label for="admin_email">'.tr('Email').'</label>
|
||||
<input type="email" class="form-control" id="admin_email" name="admin_email" placeholder="'.tr("Imposta l'indirizzo email dell'amministratore").'" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ if (!empty(flash()->getMessage('error'))) {
|
|||
|
||||
echo '
|
||||
<form action="?op=login" method="post" autocomplete="off">
|
||||
<div class="login-box card-center-medium">
|
||||
<div class="login-box">
|
||||
<div class="card card-outline card-orange">
|
||||
<div class="card-header text-center">
|
||||
<img src="'.App::getPaths()['img'].'/logo_completo.png" alt="'.tr('OpenSTAManager, il software gestionale open source per assistenza tecnica e fatturazione elettronica').'" class="img-fluid">
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ $intervento = Intervento::find($id_record);
|
|||
if (!empty($intervento->id_contratto)) {
|
||||
$query = 'SELECT `in_tipiintervento`.`id`, `title`, `co_contratti_tipiintervento`.`costo_ore` AS prezzo_ore_unitario, `co_contratti_tipiintervento`.`costo_km` AS prezzo_km_unitario, `co_contratti_tipiintervento`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `co_contratti_tipiintervento` ON `in_tipiintervento`.`id` = `co_contratti_tipiintervento`.`idtipointervento` WHERE `co_contratti_tipiintervento`.`idcontratto` = '.prepare($intervento->id_contratto).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
|
||||
} else {
|
||||
$query = 'SELECT `in_tipiintervento`.`id`, `title` as `descrizione`, `in_tariffe`.`costo_ore` AS prezzo_ore_unitario, `in_tariffe`.`costo_km` AS prezzo_km_unitario, `in_tariffe`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `in_tariffe` ON `in_tipiintervento`.`id` = `in_tariffe`.`idtipointervento` WHERE `in_tariffe`.`idtecnico` = '.prepare($sessione['idtecnico']).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
|
||||
$query = 'SELECT `in_tipiintervento`.`id`, `title`, `in_tariffe`.`costo_ore` AS prezzo_ore_unitario, `in_tariffe`.`costo_km` AS prezzo_km_unitario, `in_tariffe`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `in_tariffe` ON `in_tipiintervento`.`id` = `in_tariffe`.`idtipointervento` WHERE `in_tariffe`.`idtecnico` = '.prepare($sessione['idtecnico']).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
|
||||
}
|
||||
echo '
|
||||
<form id="add_form" action="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.get('id_record').'" method="post">
|
||||
|
|
|
|||
|
|
@ -88,6 +88,5 @@
|
|||
"windows-fix": "yarn global add windows-build-tools",
|
||||
"php-cs-fix": "vendor/bin/php-cs-fixer fix",
|
||||
"rector": "vendor/bin/rector process"
|
||||
},
|
||||
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ echo '
|
|||
<div class="card-header with-border">
|
||||
<h3 class="card-title">'.tr('Dettagli aggiuntivi').'</h3>
|
||||
<div class="card-tools pull-right">
|
||||
<button type="button" class="btn btn-tool" data-card-widget="collapse">
|
||||
<button type="button" class="btn btn-tool" data-widget="collapse">
|
||||
<i class="fa fa-'.(empty($espandi_dettagli) ? 'plus' : 'minus').'"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ echo '
|
|||
<button class="btn btn-warning btn-xs" onclick="add_calendar()">
|
||||
<i class="fa fa-plus"></i> '.tr('Aggiungi periodo').'
|
||||
</button>
|
||||
<button type="button" class="btn btn-card-tool" data-card-widget="collapse">
|
||||
<i class="fa fa-plus"></i>
|
||||
<button type="button" class="btn btn-card-tool" data-widget="collapse">
|
||||
<i class="fa fa-minus"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -102,11 +102,13 @@ class DefaultHandler implements HandlerInterface
|
|||
protected function password(&$values, &$extras)
|
||||
{
|
||||
$values['icon-after'] = ' <i onclick="togglePassword_'.$values['id'].'()" class="clickable fa" id="'.$values['id'].'_toggle"></i> ';
|
||||
|
||||
|
||||
$result = '
|
||||
<script>
|
||||
|
||||
|
||||
const characters ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!$£%-()*[]";
|
||||
|
||||
|
||||
function generateString(length) {
|
||||
let result = "";
|
||||
const charactersLength = characters.length;
|
||||
|
|
@ -115,46 +117,47 @@ class DefaultHandler implements HandlerInterface
|
|||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
function generatePassword_'.$values['id'].'() {
|
||||
var button = $("#'.$values['id'].'_generate");
|
||||
button.attr("title", "'.tr('Genera password').'");
|
||||
|
||||
|
||||
$("#'.$values['id'].'").val(generateString(10));
|
||||
$("'.$values['strength'].'").attr("disabled", false).removeClass("disabled");
|
||||
}
|
||||
|
||||
|
||||
function togglePassword_'.$values['id'].'() {
|
||||
var button = $("#'.$values['id'].'_toggle");
|
||||
|
||||
|
||||
if (button.hasClass("fa-eye")) {
|
||||
$("#'.$values['id'].'").attr("type", "text");
|
||||
button.removeClass("fa-eye").addClass("fa-eye-slash");
|
||||
button.attr("title", "'.tr('Nascondi password').'");
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$("#'.$values['id'].'").attr("type", "password");
|
||||
button.removeClass("fa-eye-slash").addClass("fa-eye");
|
||||
button.attr("title", "'.tr('Visualizza password').'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$(document).ready(function(){
|
||||
togglePassword_'.$values['id'].'();
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
if (!empty($values['strength'])) {
|
||||
$values['icon-after'] .= ' | <i onclick="generatePassword_'.$values['id'].'()" class="clickable fa fa-cog" id="'.$values['id'].'_generate"></i>';
|
||||
|
||||
|
||||
$result .= '
|
||||
<div id="'.$values['id'].'_viewport_progress"></div>
|
||||
|
||||
|
||||
<script src="'.base_path().'/assets/dist/password-strength/password.min.js"></script>
|
||||
<script>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$("#'.$values['id'].'").pwstrength({
|
||||
ui: {
|
||||
bootstrap4: true,
|
||||
bootstrap3: true,
|
||||
showVerdictsInsideProgressBar: true,
|
||||
viewports: {
|
||||
progress: "#'.$values['id'].'_viewport_progress",
|
||||
|
|
@ -174,7 +177,7 @@ class DefaultHandler implements HandlerInterface
|
|||
i18n: {
|
||||
t: function (key) {
|
||||
var result = globals.translations.password[key];
|
||||
|
||||
|
||||
return result === key ? \'\' : result;
|
||||
}
|
||||
},
|
||||
|
|
@ -182,7 +185,7 @@ class DefaultHandler implements HandlerInterface
|
|||
minChar: 8,
|
||||
onKeyUp: function(event, data) {
|
||||
var len = $("#'.$values['id'].'").val().length;
|
||||
|
||||
|
||||
if(len < 8) {
|
||||
$("'.$values['strength'].'").attr("disabled", true).addClass("disabled");
|
||||
} else {
|
||||
|
|
@ -191,15 +194,15 @@ class DefaultHandler implements HandlerInterface
|
|||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
$("#'.$values['id'].'_viewport_progress").insertAfter($("#'.$values['id'].'").closest(".form-group").find("div[id$=-errors]")).css("margin-top", "5px");
|
||||
});
|
||||
</script>';
|
||||
}
|
||||
|
||||
|
||||
// Delega al metodo "text", per la generazione del codice HTML
|
||||
$result .= $this->text($values, $extras);
|
||||
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ class Prints
|
|||
$infos = PrintTemplate::where('name', $print)->first()->id;
|
||||
|
||||
if (empty($infos)) {
|
||||
$infos = PrintTemplate::find($print)->id;
|
||||
$infos = PrintTemplate::find($print);
|
||||
}
|
||||
|
||||
if (empty($infos)) {
|
||||
|
|
@ -224,7 +224,7 @@ class Prints
|
|||
|
||||
$link .= !empty($infos['previous']) && !empty($id_record) ? '&'.$infos['previous'].'='.$id_record : '';
|
||||
} else {
|
||||
$link .= 'id_print='.$infos;
|
||||
$link .= 'id_print='.$infos['id'];
|
||||
|
||||
$link .= !empty($id_record) ? '&id_record='.$id_record : '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
echo '
|
||||
<br><br><span><big><b>CARICO SUGLI AUTOMEZZI IL '.date('d/m/Y', strtotime((string) $dt_carico)).'</b></big></span><br>';
|
||||
<br><br><span><big><b>CARICO SUGLI AUTOMEZZI IL '.date('d/m/Y', strtotime((string) $dt_carico)).'</b></big></span><br>';
|
||||
|
||||
$targa = '';
|
||||
$totale_qta = 0.000;
|
||||
|
|
@ -11,54 +11,48 @@ if ($rs) {
|
|||
if ($targa != $rs[$r]['targa']) {
|
||||
if ($targa != '') {
|
||||
echo "
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='35'>
|
||||
<col width='275'>
|
||||
<col width='50'>
|
||||
<col width='70'>
|
||||
<col width='45'>
|
||||
<col width='65'>
|
||||
<col width='65'>
|
||||
<tr>
|
||||
<td class='first_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_qta, 3, ',', '.')." kg</td>
|
||||
<td class='table_cell text-right cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".' '.'</td>
|
||||
</tr>
|
||||
</table>';
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='35'><col width='275'><col width='50'><col width='70'><col width='45'><col width='65'><col width='65'>
|
||||
<tr>
|
||||
<td class='first_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_qta, 3, ',', '.')." kg</td>
|
||||
<td class='table_cell text-right cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".' '.'</td>
|
||||
</tr>
|
||||
</table>';
|
||||
}
|
||||
|
||||
echo "
|
||||
<br/>
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='150'><col width='250'>
|
||||
<tr>
|
||||
<th bgcolor='#ffffff' class='full_cell1 cell-padded' width='150'>Targa: ".$rs[$r]['targa']."</th>
|
||||
<th bgcolor='#ffffff' class='full_cell cell-padded' width='250'>Automezzo: ".$rs[$r]['nome'].'</th>
|
||||
</tr>
|
||||
</table>';
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='150'><col width='250'>
|
||||
<tr>
|
||||
<th bgcolor='#ffffff' class='full_cell1 cell-padded' width='150'>Targa: ".$rs[$r]['targa']."</th>
|
||||
<th bgcolor='#ffffff' class='full_cell cell-padded' width='250'>Automezzo: ".$rs[$r]['nome'].'</th>
|
||||
</tr>
|
||||
</table>';
|
||||
|
||||
echo "
|
||||
<table class='table table-bordered' cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='35'><col width='275'><col width='50'><col width='70'><col width='45'><col width='65'><col width='65'>
|
||||
<tr>
|
||||
<th bgcolor='#dddddd' class='full_cell1 cell-padded' width='10%'>Codice</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' >Descrizione</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='20%'>Sub.Cat.</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Quantità</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>P. Ven.</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Totale</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Utente</th>
|
||||
</tr>";
|
||||
<table class='table table-bordered' cellspacing='0' style='table-layout:fixed;'>
|
||||
<col width='35'><col width='275'><col width='50'><col width='70'><col width='45'><col width='65'><col width='65'>
|
||||
<tr>
|
||||
<th bgcolor='#dddddd' class='full_cell1 cell-padded' width='10%'>Codice</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' >Descrizione</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='20%'>Sub.Cat.</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Quantità</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>P. Ven.</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Totale</th>
|
||||
<th bgcolor='#dddddd' class='full_cell cell-padded' width='10%'>Utente</th>
|
||||
</tr>";
|
||||
$targa = $rs[$r]['targa'];
|
||||
$totale_qta = 0.000;
|
||||
$totale_ven = 0.00;
|
||||
}
|
||||
echo '
|
||||
<tr>';
|
||||
<tr>';
|
||||
$qta = number_format($rs[$r]['qta'], 3, ',', '.').' '.$rs[$r]['um'];
|
||||
|
||||
$prz_vendita = number_format($rs[$r]['prezzo_vendita'], 2);
|
||||
|
|
@ -66,37 +60,38 @@ if ($rs) {
|
|||
$totv = number_format($prz_vendita, 2) * $rs[$r]['qta'];
|
||||
|
||||
echo "
|
||||
<td class='first_cell cell-padded'>".$rs[$r]['codice']."</td>
|
||||
<td class='table_cell cell-padded'>".$rs[$r]['descrizione']."</td>
|
||||
<td class='table_cell cell-padded'>".$rs[$r]['subcategoria']."</td>
|
||||
<td class='table_cell text-right cell-padded'>".$qta."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($prz_vendita, 2, ',', '.')." €</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totv, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".ucfirst((string) $rs[$r]['username']).'</td>
|
||||
</tr>';
|
||||
<td class='first_cell cell-padded'>".$rs[$r]['codice']."</td>
|
||||
<td class='table_cell cell-padded'>".$rs[$r]['descrizione']."</td>
|
||||
<td class='table_cell cell-padded'>".$rs[$r]['subcategoria']."</td>
|
||||
<td class='table_cell text-right cell-padded'>".$qta."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($prz_vendita, 2, ',', '.')." €</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totv, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".ucfirst((string) $rs[$r]['username']).'</td>
|
||||
</tr>';
|
||||
|
||||
$totale_ven = $totale_ven + $totv;
|
||||
if ($rs[$r]['um'] == 'kg') {
|
||||
$totale_qta = $totale_qta + $rs[$r]['qta'];
|
||||
}
|
||||
}
|
||||
echo '
|
||||
</table>';
|
||||
} else {
|
||||
echo 'Nessun articolo caricato sugli automezzi il '.date('d/m/Y', strtotime((string) $dt_carico)),'.';
|
||||
}
|
||||
|
||||
echo '
|
||||
</table>';
|
||||
|
||||
if ($targa != '') {
|
||||
echo "
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<tr>
|
||||
<td class='first_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_qta, 3, ',', '.')." kg</td>
|
||||
<td class='table_cell text-right cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".' '.'</td>
|
||||
</tr>
|
||||
</table>';
|
||||
<table cellspacing='0' style='table-layout:fixed;'>
|
||||
<tr>
|
||||
<td class='first_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_qta, 3, ',', '.')." kg</td>
|
||||
<td class='table_cell text-right cell-padded'>".' '."</td>
|
||||
<td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." €</td>
|
||||
<td class='table_cell cell-padded'>".' '.'</td>
|
||||
</tr>
|
||||
</table>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ $where = [];
|
|||
$search_targa = get('search_targa');
|
||||
$search_nome = get('search_nome');
|
||||
|
||||
$where[] = 'mg_movimenti.qta > 0';
|
||||
|
||||
$where[] = 'movimenti.qta > 0';
|
||||
$where[] = 'movimenti.qta > 0';
|
||||
if ($search_targa) {
|
||||
$where[] = 'an_sedi.targa like '.prepare('%'.$search_targa.'%');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ foreach ($liv2_patrimoniale as $liv2_p) {
|
|||
echo '
|
||||
<tr>
|
||||
<td colspan="2"><h6><b>Totale Attività</b></h6></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.($totale_attivita ? numberFormat(abs($totale_attivita), 2): '').'</b></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_attivita), 2).'</b></td>
|
||||
</tr>';
|
||||
if ($utile_perdita > 0) {
|
||||
echo '
|
||||
|
|
@ -182,7 +182,7 @@ foreach ($liv2_patrimoniale as $liv2_p) {
|
|||
echo '
|
||||
<tr>
|
||||
<td colspan="2"><h6><b>Totale Passività</b></h6></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.($totale_passivita ? numberFormat(abs($totale_passivita), 2):'').'</b></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_passivita), 2).'</b></td>
|
||||
</tr>';
|
||||
if ($utile_perdita < 0) {
|
||||
echo '
|
||||
|
|
@ -262,7 +262,7 @@ foreach ($liv2_economico as $liv2_e) {
|
|||
echo '
|
||||
<tr>
|
||||
<td colspan="2"><h6><b>Totale costi</b></h6></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.($totale_costi ? numberFormat(abs($totale_costi), 2) : '').'</b></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_costi), 2).'</b></td>
|
||||
<td></td>
|
||||
</tr>';
|
||||
if ($utile_perdita < 0) {
|
||||
|
|
@ -274,7 +274,7 @@ if ($utile_perdita < 0) {
|
|||
</tr>
|
||||
<tr>
|
||||
<td colspan="2"><h6><b>Totale a pareggio</b></h6></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.($totale_costi ? numberFormat(abs($totale_costi)) : 0) + ($utile_perdita ? numberFormat(abs($utile_perdita), 2) : 0).'</b></td>
|
||||
<td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_costi) + abs($utile_perdita), 2).'</b></td>
|
||||
<td></td>
|
||||
</tr>';
|
||||
}
|
||||
|
|
@ -335,7 +335,7 @@ foreach ($liv2_economico as $liv2_e) {
|
|||
echo '
|
||||
<tr>
|
||||
<td colspan="2"><h6><b>Totale ricavi</b></h6></td>
|
||||
<td style="font-size:8pt;" class="text-right"><b>'.($totale_ricavi ? numberFormat(abs($totale_ricavi), 2) : '').'</b></td>
|
||||
<td style="font-size:8pt;" class="text-right"><b>'.numberFormat(abs($totale_ricavi), 2).'</b></td>
|
||||
<td></td>
|
||||
</tr>';
|
||||
if ($utile_perdita > 0) {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ if (post('acquisto') == 'standard') {
|
|||
}
|
||||
|
||||
if (post('tipo') == 'nozero') {
|
||||
$query = str_replace('1=1 AND 1=1', '1=1 AND `qta_totale` > 0', $query);
|
||||
$query = str_replace('2=2', '2=2 AND `qta_totale` > 0', $query);
|
||||
}
|
||||
|
||||
$data = Query::executeAndCount($query);
|
||||
|
|
|
|||
|
|
@ -48,9 +48,8 @@ if (get('lev') == '2' || get('lev') == '3') {
|
|||
$totale_passivo += $patrimoniale[$i]['totale'];
|
||||
}
|
||||
}
|
||||
echo '
|
||||
</table>
|
||||
<table class="table table-striped table-bordered">
|
||||
echo '</table>
|
||||
<table class="table table-striped table-bordered">
|
||||
<tr>
|
||||
<th width="25%">TOTALE ATTIVITÀ</th>
|
||||
<th width="25%" class="text-right">'.moneyFormat(abs($totale_attivo), 2).'</th>
|
||||
|
|
@ -61,19 +60,19 @@ if (get('lev') == '2' || get('lev') == '3') {
|
|||
|
||||
if ($utile_perdita['totale'] <= 0) {
|
||||
echo '
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>UTILE</th>
|
||||
<th class="text-right">'.($utile_perdita['totale'] ? moneyFormat(abs($utile_perdita['totale']), 2) : 0).'</th>
|
||||
</tr>';
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>UTILE</th>
|
||||
<th class="text-right">'.moneyFormat(abs($utile_perdita['totale']), 2).'</th>
|
||||
</tr>';
|
||||
$totale_passivo = abs($totale_passivo + $utile_perdita['totale']);
|
||||
} else {
|
||||
echo '
|
||||
<th>PERDITA</th>
|
||||
<th class="text-right">'.moneyFormat(abs($utile_perdita['totale']), 2).'</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>';
|
||||
<th>PERDITA</th>
|
||||
<th class="text-right">'.moneyFormat(abs($utile_perdita['totale']), 2).'</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>';
|
||||
$totale_attivo = abs($totale_attivo + $utile_perdita['totale']);
|
||||
}
|
||||
|
||||
|
|
@ -84,5 +83,7 @@ if (get('lev') == '2' || get('lev') == '3') {
|
|||
<th>TOTALE A PAREGGIO</th>
|
||||
<th class="text-right">'.moneyFormat(abs($totale_passivo), 2).'</th>
|
||||
</tr>
|
||||
</table>';
|
||||
</table>';
|
||||
}
|
||||
|
||||
echo '</tbody></table>';
|
||||
|
|
|
|||
|
|
@ -116,15 +116,4 @@ INSERT INTO `zz_settings` (`nome`, `valore`, `tipo`, `editable`, `sezione`, `ord
|
|||
INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES ((SELECT `valore` FROM `zz_settings` WHERE `nome` = 'Lingua'), (SELECT `id` FROM `zz_settings` WHERE `nome`='Utilizza codice articolo come barcode'), 'Utilizza codice articolo come barcode', '');
|
||||
|
||||
-- Aggiunte note sessioni
|
||||
ALTER TABLE `in_interventi_tecnici` ADD `note` TEXT NOT NULL AFTER `tipo_scontokm`;
|
||||
|
||||
-- Fix campo id visibile in vista Fasce orarie
|
||||
UPDATE `zz_views` SET `visible` = '0' WHERE `zz_views`.`name` = 'id' AND `zz_views`.`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Fasce orarie')
|
||||
|
||||
-- Fix widget Anagrafiche in modulo Anagrafiche
|
||||
UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Cliente\'){ $(\'#th_Tipo input\').val(\'Cliente\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di clienti';
|
||||
UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Tecnico\'){ $(\'#th_Tipo input\').val(\'Tecnico\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di tecnici';
|
||||
UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Fornitore\'){ $(\'#th_Tipo input\').val(\'Fornitore\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di fornitori';
|
||||
UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Agente\'){ $(\'#th_Tipo input\').val(\'Agente\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di agenti';
|
||||
UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Vettore\'){ $(\'#th_Tipo input\').val(\'Vettore\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di vettori';
|
||||
UPDATE `zz_widgets` SET `more_link` = "$(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');" WHERE `zz_widgets`.`name` = 'Tutte le anagrafiche';
|
||||
ALTER TABLE `in_interventi_tecnici` ADD `note` TEXT NOT NULL AFTER `tipo_scontokm`;
|
||||
Loading…
Reference in New Issue