task #5877 overview: Module comptabilité : journaux, voir toutes les périodes
This commit is contained in:
parent
adc621e360
commit
7266354401
6 changed files with 43 additions and 14 deletions
|
|
@ -76,7 +76,7 @@ BODY {
|
|||
<script src="scripts.js" type="text/javascript"></script>
|
||||
</head>
|
||||
<BODY onLoad="SetFocus(\'login\',0)">
|
||||
Version 2.0.7
|
||||
Version 2.0.7cvs
|
||||
<div class="remark">
|
||||
<p class="gras">Il est conseillé de ne PAS utiliser Internet Explorer.
|
||||
</p><p>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ $w->name="p_periode";
|
|||
// filter on the current year
|
||||
$filter_year=" where p_exercice='".$User->getExercice()."'";
|
||||
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end");
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
||||
$User=new cl_user($cn);
|
||||
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
|
||||
$w->selected=$current;
|
||||
|
|
@ -202,7 +202,13 @@ echo 'P
|
|||
// Show list of sell
|
||||
echo_debug ("user_action_ach.php");
|
||||
// Date - date of payment - Customer - amount
|
||||
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current." and jr_def_id=".$_GET['p_jrn'];
|
||||
if ( $current == -1) {
|
||||
$cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')";
|
||||
} else {
|
||||
$cond=" and jr_tech_per=".$current;
|
||||
}
|
||||
|
||||
$sql=SQL_LIST_ALL_INVOICE.$cond." and jr_def_id=".$_GET['p_jrn'];
|
||||
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ $w=new widget("select");
|
|||
// filter on the current year
|
||||
$filter_year=" where p_exercice='".$User->getExercice()."'";
|
||||
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end");
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
||||
$User=new cl_user($cn);
|
||||
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
|
||||
$w->selected=$current;
|
||||
|
|
@ -192,8 +192,14 @@ echo 'P
|
|||
|
||||
// Show list of sell
|
||||
echo_debug ("user_action_jrn.php");
|
||||
if ( $current == -1) {
|
||||
$cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')";
|
||||
} else {
|
||||
$cond=" and jr_tech_per=".$current;
|
||||
}
|
||||
|
||||
// Date - date of payment - Customer - amount
|
||||
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current." and jr_def_id=".$_GET['p_jrn'];
|
||||
$sql=SQL_LIST_ALL_INVOICE.$cond." and jr_def_id=".$_GET['p_jrn'];
|
||||
|
||||
// Nav. bar
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
|
|
|
|||
|
|
@ -52,15 +52,20 @@ $w=new widget("select");
|
|||
// filter on the current year
|
||||
$filter_year=" where p_exercice='".$User->getExercice()."'";
|
||||
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end");
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
||||
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
|
||||
$w->selected=$current;
|
||||
echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
|
||||
?>
|
||||
</form>
|
||||
<?
|
||||
if ( $current == -1) {
|
||||
$cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')";
|
||||
} else {
|
||||
$cond=" and jr_tech_per=".$current;
|
||||
}
|
||||
|
||||
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current;
|
||||
$sql=SQL_LIST_ALL_INVOICE.$cond;
|
||||
// Nav. bar
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ $w=new widget("select");
|
|||
// filter on the current year
|
||||
$filter_year=" where p_exercice='".$User->getExercice()."'";
|
||||
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end");
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
||||
$User=new cl_user($cn);
|
||||
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
|
||||
$w->selected=$current;
|
||||
|
|
@ -184,7 +184,13 @@ echo 'P
|
|||
?>
|
||||
</form>
|
||||
<?
|
||||
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current." and jr_def_id=".$_GET['p_jrn'] ;
|
||||
if ( $current == -1) {
|
||||
$cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')";
|
||||
} else {
|
||||
$cond=" and jr_tech_per=".$current;
|
||||
}
|
||||
|
||||
$sql=SQL_LIST_ALL_INVOICE.$cond." and jr_def_id=".$_GET['p_jrn'] ;
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
||||
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ $w=new widget("select");
|
|||
// filter on the current year
|
||||
$filter_year=" where p_exercice='".$User->getExercice()."'";
|
||||
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end");
|
||||
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
||||
// User is already set User=new cl_user($cn);
|
||||
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
|
||||
$w->selected=$current;
|
||||
|
|
@ -206,10 +206,16 @@ echo 'P
|
|||
}
|
||||
// Show list of sell
|
||||
// Date - date of payment - Customer - amount
|
||||
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current." and jr_def_id=".$_GET['p_jrn'] ;
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
||||
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
||||
if ( $current == -1) {
|
||||
$cond=" and jr_tech_per in (select p_id from parm_periode where p_exercice='".$User->getExercice()."')";
|
||||
} else {
|
||||
$cond=" and jr_tech_per=".$current;
|
||||
}
|
||||
|
||||
$sql=SQL_LIST_ALL_INVOICE.$cond." and jr_def_id=".$_GET['p_jrn'] ;
|
||||
$step=$_SESSION['g_pagesize'];
|
||||
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
||||
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
||||
|
||||
list($max_line,$list)=ListJrn($cn,$_GET['p_jrn'],$sql,null,$offset,1);
|
||||
$bar=jrn_navigation_bar($offset,$max_line,$step,$page);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue