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

Migliorie nuova stampa scadenzario

This commit is contained in:
Matteo 2022-07-29 15:44:36 +02:00
parent d85de431ee
commit d3b974cfbf
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/stampe_contabili/stampa_scadenzario.php
View File

@ -23,8 +23,6 @@ include_once __DIR__.'/../../core.php';
$link = Prints::getHref('Scadenzario', null);
echo '
<form action="" method="post" onsubmit="if($(this).parsley().validate()) { return avvia_stampa(); }" >
<div class="row">
<div class="col-md-4">
{[ "type": "date", "label": "'.tr('Data inizio').'", "name": "data_inizio", "value": "" ]}
@ -50,14 +48,12 @@ echo '
<div class="row">
<div class="col-md-12 text-right">
<button type="submit" class="btn btn-primary">
<button type="button" onclick="avvia_stampa();" class="btn btn-primary">
<i class="fa fa-print"></i> '.tr('Stampa scadenzario').'
</button>
</div>
</div>
</form>
<script>$(document).ready(init)</script>';
echo '
@ -71,7 +67,6 @@ echo '
var is_fornitore = $("#is_fornitore").is(":checked");
window.open("'.$link.'&data_inizio="+data_inizio+"&data_fine="+data_fine+"&is_pagata="+is_pagata+"&is_riba="+is_riba+"&is_cliente="+is_cliente+"&is_fornitore="+is_fornitore, "_blank");
return false;
}
$("#is_cliente").change(function() {

15
templates/scadenzario/init.php
View File

@ -29,15 +29,20 @@ $total = Util\Query::readQuery($module);
// Lettura parametri modulo
$module_query = $total['query'];
if(!empty(get('data_inizio')) AND !empty(get('data_fine'))){
$module_query = str_replace('1=1', '1=1 AND `data` BETWEEN "'.get('data_inizio').'" AND "'.get('data_fine').'"', $module_query);
if(!empty(get('data_inizio'))){
$module_query = str_replace('1=1', '1=1 AND DATE_FORMAT(`data`, "%Y%m%d") >= "'.date('Ymd', strtotime(get('data_inizio'))).'"', $module_query);
$date_start = get('data_inizio');
$date_end = get('data_fine');
}
if(get('is_pagata')=='true'){
$module_query = str_replace('AND ABS(`co_scadenziario`.`pagato`) < ABS(`co_scadenziario`.`da_pagare`) ', '', $module_query);
if(!empty(get('data_fine'))){
$module_query = str_replace('1=1', '1=1 AND DATE_FORMAT(`data`, "%Y%m%d") <= "'.date('Ymd', strtotime(get('data_fine'))).'"', $module_query);
$date_start = get('data_inizio');
}
if(get('is_pagata')=='false'){
$module_query = str_replace('1=1', '1=1 AND ABS(`co_scadenziario`.`pagato`) < ABS(`co_scadenziario`.`da_pagare`) ', $module_query);
}
if(get('is_riba')=='true'){