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

Bug : rapport, cannot use it

Browse source
This commit is contained in:
Dany De Bontridder 2014-03-13 21:17:17 +01:00
parent 67c9d39374
commit 42050d6362
4 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
html/js/scripts.js
View file

@ -118,21 +118,21 @@ function g(ID)
*/
function enable_type_periode()
{
if (g('type_periode').value === 1)
if ($("type_periode").options[$("type_periode").selectedIndex].value == 0)
{
g('from_periode').disabled = true;
g('to_periode').disabled = true;
g('from_date').disabled = false;
g('to_date').disabled = false;
g('p_step').disabled = true;
$('from_periode').enable();
$('to_periode').enable ();
$('from_date').disable();
$('to_date').disable();
$('p_step').enable();
}
else
{
g('from_periode').disabled = false;
g('to_periode').disabled = false;
g('from_date').disabled = true;
g('to_date').disabled = true;
g('p_step').disabled = false;
$('from_periode').disable();
$('to_periode').disable ();
$('from_date').enable();
$('to_date').enable();
$('p_step').disable();
}
}
@ -814,7 +814,7 @@ function show_ledger_choice(json_obj)
};
//var y=calcy(posY);
var y=posY;
if (json_obj.div !== '')obj.cssclass="";
if (json_obj.div != '')obj.cssclass="";
obj.style="top:"+y+'px;'+obj.style;
/* if ( json_obj.class )
{

5
include/export_form_csv.php
View file

@ -40,7 +40,8 @@ $Form=new Acc_Report($cn,$_GET['form_id']);
$Form->get_name();
// Step ?
//--
if ( $_GET['p_step'] == 0 )
$step=HtmlInput::default_value_get("p_step", 0);
if ( $step == 0 )
{
if ( $_GET ['type_periode'] == 0 )
$array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $_GET['type_periode']);
@ -64,7 +65,7 @@ if ( $_GET['p_step'] == 0 )
}
}
else
elseif ($step == 1)
{
// Gather all the data
//---

6
include/export_form_pdf.php
View file

@ -50,7 +50,9 @@ $pdf->setTitle("Rapport ".$Libelle,true);
// Step ??
//--
if ( $_GET['p_step'] == 0 )
$step=HtmlInput::default_value_get("p_step", 0);
if ( $step == 0 )
{
// No step asked
//--
@ -78,7 +80,7 @@ else
$pdf->SetFont('DejaVuCond','',8);
// without step
if ( $_GET['p_step'] == 0 )
if ( $step == 0 )
{
if ( $_GET['type_periode'] == 0 )
{

15
include/impress_rapport.inc.php
View file

@ -40,15 +40,15 @@ if ( isset( $_GET['bt_html'] ) )
$Form->get_name();
// step asked ?
//--
$type_periode=HtmlInput::default_value_get("type_periode", -1);
if ( $type_periode == 1 )
$array=$Form->get_row( $_GET['from_date'],$_GET['to_date'], $type_periode);
if ( $_GET['type_periode'] == 1 )
$array=$Form->get_row( $_GET['from_date'],$_GET['to_date'], $_GET['type_periode']);
if ($_GET['type_periode'] == 0 && $_GET['p_step'] == 0 )
$array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $_GET['type_periode']);
if ($type_periode == 0 && $_GET['p_step'] == 0)
$array=$Form->get_row( $_GET['from_periode'],$_GET['to_periode'], $type_periode);
if ($_GET['type_periode'] == 0 && $_GET['p_step'] == 1 )
if ($type_periode == 0 && $_GET['p_step'] == 1 )
{
// step are asked
//--
@ -132,7 +132,7 @@ if ( isset( $_GET['bt_html'] ) )
echo "</table>";
if ( count($Form->row ) == 0 )
exit;
if ( $_GET['type_periode']==0 )
if ( $_GET['type_periode']== 0 )
{
if ( $_GET['p_step'] == 0)
{ // check the step
@ -249,6 +249,7 @@ $aStep=array(
);
echo '<tr>';
echo td('Par étape de');
$w->id='p_step';
echo $w->input('p_step',$aStep);
echo '</TR>';