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

Merged revisions 5584 via svnmerge from

Browse source 
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5584 | danydb | 2013-12-08 14:29:06 +0100 (dim., 08 déc. 2013) | 5 lines
  
  bug #0000928 	Fenêtre Journaux dans fenêtre recherche est clippé
  
  Bug fixed for PRINTBAL and PRINTREC, fixed in export CSV and PDF
  
  Task #928 - Fenêtre Journaux dans fenêtre recherche est clippé
........
This commit is contained in:
Dany De Bontridder 2013-12-08 13:39:54 +00:00
parent a3062d4ffc
commit c44a926b0e
7 changed files with 85 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html/js/scripts.js
View file

@ -815,6 +815,10 @@ function show_ledger_choice(json_obj)
var y=posY;
if (json_obj.div != '')obj.cssclass="";
obj.style="top:"+y+obj.style;
if ( json_obj.class )
{
obj.cssclass=json_obj.class;
}
add_div(obj);

12
include/ac_common.php
View file

@ -1094,4 +1094,16 @@ function display_dashboard_operation($p_array,$p_title,$p_div)
</div>
<?php
}
function get_array_column($p_array,$key)
{
$array=array();
for ($i=0;$i<count($p_array);$i++)
{
$r=$p_array[$i];
if ( isset($r[$key])) {
$array[]=$r[$key];
}
}
return $array;
}
?>

27
include/balance.inc.php
View file

@ -91,7 +91,8 @@ echo ' jusque :'.$input_to->input();
echo 'Filtre ';
$rad=new IRadio();
$array_ledger=$g_user->get_ledger('ALL',3);
$selected=(isset($_GET['r_jrn']))?$_GET['r_jrn']:null;
$array=get_array_column($array_ledger,'jrn_def_id');
$selected=(isset($_GET['balr_jrn']))?$_GET['balr_jrn']:null;
$select_cat=(isset($_GET['r_cat']))?$_GET['r_cat']:null;
$array_cat=Acc_Ledger::array_cat();
@ -101,7 +102,9 @@ else $rad->selected=false;
echo '<li>'.$rad->input('p_filter',0).'Aucun filtre, tous les journaux'.'</li>';
if ( isset($_GET['p_filter']) && $_GET['p_filter']==1) $rad->selected='t';
else $rad->selected=false;
echo '<li>'.$rad->input('p_filter',1).'Filtré par journal'.HtmlInput::select_ledger($array_ledger,$selected).'</li>';
echo '<li>'.$rad->input('p_filter',1).'Filtré par journal ';
echo HtmlInput::button_choice_ledger(array('div'=>'bal','type'=>'ALL','all_type'=>1));
echo '</li>';
if ( isset($_GET['p_filter']) && $_GET['p_filter']==2) $rad->selected='t';
else $rad->selected=false;
echo '<li>'.$rad->input('p_filter',2).'Filtré par catégorie'.HtmlInput::select_cat($array_cat).'</li>';
@ -194,9 +197,9 @@ if ( isset ($_GET['view'] ) )
HtmlInput::hidden("from_periode",$_GET['from_periode']).
HtmlInput::hidden("to_periode",$_GET['to_periode']);
echo HtmlInput::hidden('p_filter',$_GET['p_filter']);
for ($e=0;$e<count($array_ledger);$e++)
if (isset($selected[$e]))
echo HtmlInput::hidden("r_jrn[$e]",$e);
for ($e=0;$e<count($selected);$e++)
if (isset($selected[$e]) && in_array ($selected[$e],$array))
echo HtmlInput::hidden("r_jrn[$e]",$selected[$e]);
for ($e=0;$e<count($array_cat);$e++)
if (isset($select_cat[$e]))
echo HtmlInput::hidden("r_cat[$e]",$e);
@ -215,9 +218,11 @@ if ( isset ($_GET['view'] ) )
HtmlInput::hidden("to_periode",$_GET['to_periode']);
echo HtmlInput::get_to_hidden(array('ac'));
echo HtmlInput::hidden('p_filter',$_GET['p_filter']);
if (isset($_GET ['r_jrn']))
if (isset($selected[$e]))
echo HtmlInput::hidden("r_jrn[$e]",$e);
for ($e=0;$e<count($selected);$e++){
if (isset($selected[$e]) && in_array ($selected[$e],$array)){
echo HtmlInput::hidden("r_jrn[$e]",$selected[$e]);
}
}
for ($e=0;$e<count($array_cat);$e++)
if (isset($select_cat[$e]))
echo HtmlInput::hidden("r_cat[$e]",$e);
@ -244,9 +249,9 @@ if ( isset($_GET['view'] ) )
$bal=new Acc_Balance($cn);
if ( $_GET['p_filter']==1)
{
for ($e=0;$e<count($array_ledger);$e++)
if (isset($selected[$e]))
$bal->jrn[]=$array_ledger[$e]['jrn_def_id'];
for ($e=0;$e<count($selected);$e++)
if (isset($selected[$e]) && in_array ($selected[$e],$array))
$bal->jrn[]=$selected[$e];
}
if ( $_GET['p_filter'] == 0 )
{

44
include/class_html_input.php
View file

@ -777,5 +777,47 @@ class HtmlInput
$button->javascript="calendar_zoom($obj)";
return $button->input();
}
/**
*
* @param type $p_array indice
* - div div name
* - type ALL, VEN, ACH or ODS
* - all_type 1 yes 0 no
*
*/
static function button_choice_ledger($p_array)
{
extract ($p_array);
$bledger_param = json_encode(array(
'dossier' => $_REQUEST['gDossier'],
'type' => $type,
'all_type' => $all_type,
'div' => $div,
'class'=>'inner_box'
));
}
$bledger_param = str_replace('"', "'", $bledger_param);
$bledger = new ISmallButton('l');
$bledger->label = "choix des journaux";
$bledger->javascript = " show_ledger_choice($bledger_param)";
$f_ledger = $bledger->input();
$hid_jrn = "";
if (isset($_REQUEST[$div . 'nb_jrn']))
{
for ($i = 0; $i < $_REQUEST[$div . 'nb_jrn']; $i++)
{
if (isset($_REQUEST[$div . "r_jrn"][$i]))
$hid_jrn.=HtmlInput::hidden($div . 'r_jrn[' . $i . ']', $_REQUEST[$div . "r_jrn"][$i]);
}
$hid_jrn.=HtmlInput::hidden($div . 'nb_jrn', $_REQUEST[$div . 'nb_jrn']);
} else
{
$hid_jrn = HtmlInput::hidden($div . 'nb_jrn', 0);
}
echo $f_ledger;
echo '<span id="ledger_id' . $div . '">';
echo $hid_jrn;
echo '</span>';
}
}

7
include/export_balance_csv.php
View file

@ -49,10 +49,11 @@ case 1:
{
$selected=$_GET['r_jrn'];
$array_ledger=$g_user->get_ledger('ALL',3);
for ($e=0;$e<count($array_ledger);$e++)
$array=get_array_column($array_ledger,'jrn_def_id');
for ($e=0;$e<count($selected);$e++)
{
if (isset ($selected[$e]))
$bal->jrn[]=$array_ledger[$e]['jrn_def_id'];
if (isset ($selected[$e]) && in_array ($selected[$e],$array) )
$bal->jrn[]=$selected[$e];
}
}
break;

7
include/export_balance_pdf.php
View file

@ -58,10 +58,11 @@ case 1:
{
$selected=$_GET['r_jrn'];
$array_ledger=$g_user->get_ledger('ALL',3);
for ($e=0;$e<count($array_ledger);$e++)
$array=get_array_column($array_ledger,'jrn_def_id');
for ($e=0;$e<count($selected);$e++)
{
if (isset ($selected[$e]))
$bal->jrn[]=$array_ledger[$e]['jrn_def_id'];
if (isset ($selected[$e]) && in_array ($selected[$e],$array))
$bal->jrn[]=$selected[$e];
}
}
break;

3
include/impress_rec.inc.php
View file

@ -40,7 +40,8 @@ $choice=(isset($_GET['choice']))?$_GET['choice']:0;
$r_jrn=(isset($_GET['r_jrn']))?$_GET['r_jrn']:'';
echo '<form method="GET">';
echo dossier::hidden().HtmlInput::hidden('ac',$_GET['ac']).HtmlInput::hidden('type','rec');
echo 'Filtre par journal :'.HtmlInput::select_ledger($aledger,$r_jrn );
echo 'Filtre par journal';
HtmlInput::button_choice_ledger(array('div'=>'','type'=>'ALL','all_type'=>1));
echo '<br/>';
/*
* Limit by date, default current exercice