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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Vincent Danjean 2014-11-18 21:36:59 +01:00
commit 0ac146db07
228 changed files with 9685 additions and 1689 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/balance.inc.php
View file

@ -16,7 +16,7 @@
* along with NOALYSS; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// Auteur Dany De Bontridder danydb@aevalys.eu
// Copyright(2004) Dany De Bontridder danydb@aevalys.eu
/*! \file
* \brief Show the balance and let you print it or export to PDF
* file included by user_impress
@ -42,9 +42,9 @@ echo '<div class="content">';
/*
* Let you change the exercice
*/
echo '<fieldset class="noprint"><legend>'._('Choississez un autre exercice').'</legend>';;
echo '<fieldset class="noprint"><legend>'._('Exercice').'</legend>';;
echo '<form method="GET">';
echo 'Choississez un autre exercice :';
echo _('Choississez un autre exercice')." : ";
$ex=new Exercice($cn);
$wex=$ex->select('exercice',$exercice,' onchange="submit(this)"');
echo $wex->input();
@ -72,7 +72,7 @@ $input_from->cn=$cn;
$input_from->filter_year=true;
$input_from->user=$g_user;
echo 'Depuis :'.$input_from->input();
echo _('Depuis').' :'.$input_from->input();
// filter on the current year
$to=(isset($_GET["to_periode"]))?$_GET['to_periode']:"";
$input_to=new IPeriod("to_periode",$to,$exercice);
@ -81,13 +81,14 @@ $input_to->filter_year=true;
$input_to->type=ALL;
$input_to->cn=$cn;
$input_to->user=$g_user;
echo ' jusque :'.$input_to->input();
echo " "._('jusque').' :'.$input_to->input();
echo '<br>';
echo HtmlInput::button_action(_('Avancé'), " if (\$('balance_advanced_div').style.display=='none') { \$('balance_advanced_div').show();} else { \$('balance_advanced_div').hide();}");
//-------------------------------------------------
echo '<div id="balance_advanced_div" style="display:none">';
/* add a all ledger choice */
echo 'Filtre ';
echo _('Filtre')." ";
$rad=new IRadio();
$array_ledger=$g_user->get_ledger('ALL',3);
$array=get_array_column($array_ledger,'jrn_def_id');
@ -172,6 +173,7 @@ echo '<p>';
echo _("Avec la balance de l'année précédente")." ".$previous_exc->input();
echo '</p>';
echo '</div>';
echo '</div>';
echo HtmlInput::submit("view",_("Visualisation"));
echo '</form>';
echo '<hr>';