admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev7109' into entreprise

Browse source
This commit is contained in:
Dany De Bontridder 2019-09-14 23:39:02 +02:00
commit 17f4ad854f
11 changed files with 110 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

9
html/js/acc_ledger.js
View file

@ -984,12 +984,13 @@ function dsp_letter(obj)
{
try
{
var queryString = 'gDossier=' + obj.gDossier + '&j_id=' + obj.j_id + '&op=dl' + '&ot=' + obj.obj_type;
//var queryString = 'gDossier=' + obj.gDossier + '&j_id=' + obj.j_id + '&op=dl' + '&ot=' + obj.obj_type+'&start='+obj.start;
var action = new Ajax.Request(
"ajax_misc.php",
{
method: 'get',
parameters: queryString,
parameters: obj,
onFailure: error_dsp_letter,
onSuccess: success_dsp_letter
}
@ -1050,8 +1051,8 @@ function search_letter(obj)
str_query = 'gDossier=' + obj.elements['gDossier'].value;
if (obj.elements['j_id'])
str_query += '&j_id=' + obj.elements['j_id'].value;
if (obj.elements['ot'])
str_query += '&ot=' + obj.elements['ot'].value;
if (obj.elements['obj_type'])
str_query += '&obj_type=' + obj.elements['obj_type'].value;
if (obj.elements['op'])
str_query += '&op=' + obj.elements['op'].value;
if (obj.elements['min_amount'])

43
include/ajax/ajax_display_letter.php
View file

@ -28,6 +28,20 @@
if (!defined('ALLOWED'))
die('Appel direct ne sont pas permis');
$http=new HttpInput();
try {
$obj_type=$http->get("obj_type");
$j_id=$http->get("j_id","number");
$op=$http->get("op");
}catch (Exception $e )
{
record_log($e->getMessage());
record_log($e->getTraceAsString());
return;
}
require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
$exercice=$g_user->get_exercice();
if ($g_user->check_module("LETCARD")==0 && $g_user->check_module("LETACC")==0)
@ -60,14 +74,15 @@ $r.='<div style="float:left;">';
// needed hidden var
$r.=dossier::hidden();
if (isset($_REQUEST['ac']))
$r.=HtmlInput::hidden('ac', $_REQUEST['ac']);
$r.=HtmlInput::hidden('ac', $http->request('ac'));
if (isset($_REQUEST['sa']))
$r.=HtmlInput::hidden('sa', $_REQUEST['sa']);
$r.=HtmlInput::hidden('sa', $http->request('sa'));
if (isset($_REQUEST['acc']))
$r.=HtmlInput::hidden('acc', $_REQUEST['acc']);
$r.=HtmlInput::hidden('acc', $http->request('acc'));
$r.=HtmlInput::hidden('j_id', $j_id);
$r.=HtmlInput::hidden('op', $op);
$r.=HtmlInput::hidden('ot', $ot);
$r.=HtmlInput::hidden('obj_type', $obj_type);
$r.='<table>';
//min amount
@ -88,6 +103,7 @@ $r.=tr($line);
$date_error="";
// start date
$start=new IDate('search_start');
$search_start=$http->get("search_start");
/* check if date are valid */
if (isset($search_start)&&isDate($search_start)==null)
@ -104,6 +120,8 @@ $line=td(_('Date Début')).td($start->input());
// end date
$end=new IDate('search_end');
/* check if date are valid */
$search_end=$http->get("search_end","date");
if (isset($search_end)&&isDate($search_end)==null)
{
ob_start();
@ -165,22 +183,11 @@ $form='<div id="result" style="float:top;clear:both">';
$form.='<FORM id="letter_form" METHOD="post">';
$form.=dossier::hidden();
if (isset($_REQUEST['p_action']))
$form.=HtmlInput::hidden('p_action', $_REQUEST['p_action']);
if (isset($_REQUEST['sa']))
$form.=HtmlInput::hidden('sa', $_REQUEST['sa']);
if (isset($_REQUEST['acc']))
$form.=HtmlInput::hidden('acc', $_REQUEST['acc']);
if (isset($_REQUEST['sc']))
$form.=HtmlInput::hidden('sc', $_REQUEST['sc']);
if (isset($_REQUEST['sb']))
$form.=HtmlInput::hidden('sb', $_REQUEST['sb']);
if (isset($_REQUEST['f_id']))
$form.=HtmlInput::hidden('f_id', $_REQUEST['f_id']);
$form.=HtmlInput::array_to_hidden(['p_action','sa','acc','sc','sb','f_id'],$_REQUEST);
// display a list of operation from the other side + box button
if ($ot=='account')
if ($obj_type=='account')
{
$obj=new Lettering_Account($cn, $row['j_poste']);
if (isset($search_start))
@ -196,7 +203,7 @@ if ($ot=='account')
$form.=$obj->show_letter($j_id);
}
else if ($ot=='card')
else if ($obj_type=='card')
{
$obj=new Lettering_Card($cn, $row['j_qcode']);
if (isset($search_start))

2
include/balance.inc.php
View file

@ -421,7 +421,7 @@ if ( isset($_GET['view'] ) )
echo td(nbm($r['sum_deb_previous']),' class="previous_year"');
echo td(nbm($r['sum_cred_previous']),' class="previous_year" ');
$solde_previous=bcsub($r['solde_deb_previous'],$r['solde_cred_previous']);
$side=($solde_previous<0)?"D":"C";
$side=($solde_previous<0)?"C":"D";
$side=($solde_previous==0)?"":$side;
$r['solde_previous']=$solde_previous;
echo td(nbm(abs($solde_previous))." ".$side,' class="previous_year"');

1
include/class/lettering.class.php
View file

@ -43,6 +43,7 @@ class Lettering
"sql_ledger"=>"sql_ledger" /* the sql clause to filter on the available ledgers */
)
;
/**
* constructor
*@param $p_init resource to database

1
include/class/pdf.class.php
View file

@ -43,6 +43,7 @@ class PDF extends PDF_Core
$this->date = date('d.m.Y');
parent::__construct($orientation,$unit,$format);
date_default_timezone_set ('Europe/Paris');
$this->SetCreator("Noalyss");
}
function setDossierInfo($dossier = "n/a")
{

22
include/export/export_balance_csv.php
View file

@ -34,6 +34,7 @@ $cn=Dossier::connect();
bcscale(2);
require_once NOALYSS_INCLUDE.'/class/user.class.php';
$http=new HttpInput();
$export=new Noalyss_Csv('balance');
$bal=new Acc_Balance($cn);
$bal->jrn=null;
@ -45,7 +46,7 @@ case 0:
case 1:
if ( isset($_GET['r_jrn']))
{
$selected=$_GET['r_jrn'];
$selected=$http->get('r_jrn','number');
$array_ledger=$g_user->get_ledger('ALL',3);
$array=get_array_column($array_ledger,'jrn_def_id');
for ($e=0;$e<count($selected);$e++)
@ -56,25 +57,32 @@ case 1:
}
break;
case 2:
if ( isset($_GET['r_cat'])) $bal->filter_cat($_GET['r_cat']);
if ( isset($_GET['r_cat'])) $bal->filter_cat($http->get('r_cat'));
break;
}
$bal->from_poste=$_GET['from_poste'];
$bal->to_poste=$_GET['to_poste'];
$bal->from_poste=$http->get('from_poste');
$bal->to_poste=$http->get('to_poste');
if (isset($_GET['unsold'])) $bal->unsold=true;
$prev = (isset($_GET['previous_exc'])) ? 1: 0;
$row=$bal->get_row($_GET['from_periode'],
$_GET['to_periode'],
$row=$bal->get_row($http->get('from_periode','number'),
$http->get('to_periode','number'),
$prev);
$prev = ( isset ($row[0]['sum_cred_previous'])) ?1:0;
$title=array('poste','libelle');
if ($prev == 1 ) $title=array_merge($title,array('deb n-1','cred n-1','solde n-1','d/c;'));
$title=array_merge($title,array('deb','cred','solde','d/c'));
$title=array_merge($title,array(_('deb'),_('cred'),_('solde'),_('d/c')));
$export->send_header();
$pstart = new Periode($cn,$http->get("from_periode"));
$pend= new Periode($cn,$http->get("to_periode"));
$export->add(sprintf (_("balance du %s au %s"),$pstart->first_day(),$pend->last_day()));
$export->write();
$export->write_header($title);
foreach ($row as $r)
{
$export->add($r['poste']);

49
include/lettering.account.inc.php
View file

@ -26,11 +26,13 @@
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
$http=new HttpInput();
echo '<div class="content">';
echo '<div id="search">';
echo '<FORM METHOD="GET">';
echo dossier::hidden();
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('ac',$http->request('ac'));
echo HtmlInput::hidden('sa','poste');
$poste=new IPoste();
@ -60,28 +62,27 @@ echo tr($r);
$exercice=$g_user->get_exercice();
$periode=new Periode($cn);
list($first_per,$last_per)=$periode->get_limit($exercice);
// date limit
$start=new IDate('start');
if ( isset ($_GET['start']) && isDate($_GET['start']) == null )
{
echo alert(_('Date malformée, désolé'));
$_GET['start']=$first_per->first_day();
$end=new IDate('end');
try {
$start_value=$http->get("start","date",$first_per->first_day());
$end_value=$http->get("end","date",$last_per->last_day());
$start->value=$start_value;
$end->value=$end_value;
}catch (Exception $e) {
$start_value=$first_per->first_day();
$end_value=$last_per->last_day();
echo '<span class="warning">'._('Date malformée, désolé').'</span>';
}
$start->value=(isset($_GET['start']))?$_GET['start']:$first_per->first_day();
$start->value=$start_value;
$end->value=$end_value;
$r=td(_('Date début'));
$r.=td($start->input());
echo tr($r);
$end=new IDate('end');
if ( isset($_GET['end']) && isDate($_GET['end']) == null )
{
echo alert(_('Date malformée, désolé'));
$_GET['end']=$last_per->last_day();
}
$end->value=(isset($_GET['end']))?$_GET['end']:$last_per->last_day();
$r=td(_('Date fin'));
$r.=td($end->input());
echo tr($r);
@ -94,7 +95,8 @@ $sel->value=array(
array('value'=>3,'label'=>_('Opérations lettrées montants différents')),
array('value'=>2,'label'=>_('Opérations NON lettrées'))
);
if (isset($_GET['type_let'])) $sel->selected=$_GET['type_let'];
$sel->selected=$http->get('type_let','number',0);
$r= td("Filtre ").
td($sel->input());
@ -119,15 +121,10 @@ if ( isset($_POST['record']))
// Show the result
//--------------------------------------------------------------------------------
echo '<div id="list">';
if ( isDate($_GET['start']) == null || isDate($_GET['end']) == null )
{
echo alert(_('Date malformée, désolé'));
return;
}
$letter=new Lettering_Account($cn);
$letter->set_parameter('account',$_GET['acc']);
$letter->set_parameter('start',$_GET['start']);
$letter->set_parameter('end',$_GET['end']);
$letter->set_parameter('account',$http->get('acc'));
$letter->set_parameter('start',$start->value);
$letter->set_parameter('end',$end->value);
if ( $sel->selected == 0 )
echo $letter->show_list('all');
@ -139,6 +136,6 @@ if ( $sel->selected == 3 )
echo $letter->show_list('letter_diff');
echo '</div>';
echo '<div id="detail" style="display:none">';
echo 'Un instant...';
echo _('Un instant...');
echo '<IMG SRC=image/loading.gif>';
echo '</div>';

42
include/lettering.card.inc.php
View file

@ -26,12 +26,13 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
require_once NOALYSS_INCLUDE.'/class/lettering.class.php';
$http=new HttpInput();
echo '<div class="content">';
echo '<div id="search">';
echo '<FORM METHOD="GET">';
echo dossier::hidden();
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('ac',$http->request('ac'));
echo HtmlInput::hidden('sa','qc');
echo HtmlInput::hidden('p_jrn','0');
echo '<table width="50%">';
@ -45,7 +46,7 @@ $poste->set_callback('filter_card');
if (isset($_GET['acc'])) $poste->value=strtoupper(trim($_GET['acc']));
if (isset($_GET['acc'])) $poste->value=strtoupper(trim($http->get('acc')));
$poste_span=new ISpan('account_label');
$r= td(_('Lettrage pour la fiche ')).
td($poste->input().$poste->search()).
@ -56,28 +57,29 @@ $exercice=$g_user->get_exercice();
$periode=new Periode($cn);
list($first_per,$last_per)=$periode->get_limit($exercice);
// date limit
$start=new IDate('start');
if ( isset ($_GET['start']) && isDate($_GET['start']) == null )
{
echo alert(_('Date malformée, désolé'));
$_GET['start']=$first_per->first_day();
$end=new IDate('end');
try {
$start_value=$http->get("start","date",$first_per->first_day());
$end_value=$http->get("end","date",$last_per->last_day());
$start->value=$start_value;
$end->value=$end_value;
}catch (Exception $e) {
$start_value=$first_per->first_day();
$end_value=$last_per->last_day();
echo '<span class="warning">'._('Date malformée, désolé').'</span>';
}
$start->value=(isset($_GET['start']))?$_GET['start']:$first_per->first_day();
$start->value=$start_value;
$end->value=$end_value;
$r=td(_('Date début'));
$r.=td($start->input());
echo tr($r);
$end=new IDate('end');
if ( isset($_GET['end']) && isDate($_GET['end']) == null )
{
echo alert(_('Date malformée, désolé'));
$_GET['end']=$last_per->last_day();
}
$end->value=(isset($_GET['end']))?$_GET['end']:$last_per->last_day();
$r=td(_('Date fin'));
$r.=td($end->input());
@ -91,9 +93,9 @@ $sel->value=array(
array('value'=>3,'label'=>_('Opérations lettrées montants différents')),
array('value'=>2,'label'=>_('Opérations NON lettrées'))
);
if (isset($_GET['type_let'])) $sel->selected=$_GET['type_let'];
$sel->selected=$http->get("type_let","number",0);
$r= td("Filtre ").
$r= td(_("Filtre")).
td($sel->input());
echo tr($r);
@ -119,10 +121,10 @@ echo '<div id="list">';
$letter=new Lettering_Card($cn);
$quick_code=strtoupper(trim($_GET['acc']));
$quick_code=strtoupper(trim($http->get('acc')));
$letter->set_parameter('quick_code',$quick_code);
$letter->set_parameter('start',$_GET['start']);
$letter->set_parameter('end',$_GET['end']);
$letter->set_parameter('start',$start->value);
$letter->set_parameter('end',$end->value);
if ( $sel->selected == 0 )
echo $letter->show_list('all');

6
include/lib/pdf_core.class.php
View file

@ -62,11 +62,13 @@ class PDF_Core extends TFPDF
parent::__construct($orientation, $unit, $format);
$this->AddFont('DejaVu','','DejaVuSans.ttf',true);
$this->AddFont('DejaVu','I','DejaVuSans-Oblique.ttf',true);
$this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true);
$this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true);
$this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true);
$this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true);
$this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true);
$this->AddFont('DejaVuCond','BI','DejaVuSansCondensed-BoldOblique.ttf',true);
@ -263,10 +265,10 @@ class PDF_Core extends TFPDF
function is_fill($p_step)
{
if ($p_step % 2 == 0) {
$pdf->SetFillColor(220, 221, 255);
$this->SetFillColor(220, 221, 255);
$fill = 1;
} else {
$pdf->SetFillColor(0, 0, 0);
$this->SetFillColor(255, 255, 255);
$fill = 0;
}
return $p_step;

2
include/tax_summary.inc.php
View file

@ -67,6 +67,8 @@ if ( $http->get("do","string","no") == "display")
echo '</ul>';
} catch (Exception $e) {
echo '<span class="warning">';
echo $e->getMessage();
echo '</span>';
}
}

16
include/template/letter_all.php
View file

@ -51,13 +51,19 @@ $class= ( ($i % 2) == 0 ) ? "odd":"even";
<td>
<?php
$letter=($this->content[$i]['letter']==-1)?_("aucun lettrage"):strtoupper(base_convert($this->content[$i]['letter'],10,36));
$js="this.gDossier=".dossier::id().
";this.j_id=".$this->content[$i]['j_id'].
";this.obj_type='".$this->object_type."'".
";dsp_letter(this)";
$object=sprintf('{ gDossier : %s , j_id : %s , obj_type:\'%s\',search_start:\'%s\',search_end:\'%s\',op:\'dl\'} ',
$gDossier,
$this->content[$i]['j_id'],
$this->object_type,
$this->get_parameter('start'),
$this->get_parameter('end')
);
$js=sprintf("dsp_letter(%s)",$object);
?>
<A class="detail" style="text-decoration: underline" href="javascript:void(0)" onclick="<?php echo $js?>"><?php echo $letter?>
<A class="detail" style="text-decoration: underline" onclick="<?php echo $js?>"><?php echo $letter?>
<?php if ( $this->content[$i]['letter_diff'] != 0) echo $g_failed; ?>
</A>
</td>