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

Task #0000874: Amélioration impression journaux

Browse source
This commit is contained in:
Dany De Bontridder 2013-08-13 06:51:13 +00:00
parent 898c603fcd
commit 5ead468d7d
6 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/impress_jrn.inc.php
View file

@ -64,13 +64,12 @@ $NoPriv = $cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_deb,jrn_d
uj_login='$g_user->id'
and uj_priv ='X'
");
// Pour voir tout les journal ?
if ($NoPriv == 0 && $ret != null)
{
$a = count($ret);
$all = array('value' => 0, 'label' => 'Tous les journaux');
$ret[$a] = $all;
}
/*
* Show all the available ledgers
*/
$a = count($ret);
$all = array('value' => 0, 'label' => 'Tous les journaux disponibles');
$ret[$a] = $all;
if (count($ret) < 1)
NoAccess();
$exercice = (isset($_GET['exercice'])) ? $_GET['exercice'] : $g_user->get_exercice();
@ -255,6 +254,8 @@ if (isset($_REQUEST['bt_html']))
/////////////////////////////////////////////////////////////////////////////////////
elseif ($_GET['p_simple'] == 1)
{
if ( $Jrn->get_type() != 'ACH' && $Jrn->get_type() != 'VEN')
{
// Simple printing
//---
echo '<TABLE class="result">';
@ -307,6 +308,14 @@ if (isset($_REQUEST['bt_html']))
echo "</tr>";
}
echo "</table>";
} else {
/*
* Ledger ACH or VEN
*/
$own=new Own($cn);
require_once 'template/print_ledger_simple.php';
}
}
/////////////////////////////////////////////////////////////////////////////////////
// Détaillé