diff --git a/html/index.css b/html/index.css
index 63fcc4eaf..c33471356 100644
--- a/html/index.css
+++ b/html/index.css
@@ -261,7 +261,7 @@ BODY {
width: 148px;
left: 5px;
top: 22px;
- height: 115px;
+ height: 155px;
}
#login_frm {
position:absolute;
diff --git a/html/install.php b/html/install.php
index 5f923e65d..e4c44026c 100644
--- a/html/install.php
+++ b/html/install.php
@@ -1,4 +1,4 @@
-
@@ -132,7 +132,7 @@ if ( ! isset($_GET['lang'])){
require_once '../include/constant.php';
include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
include_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
-include_once '../lib/function_javascript.php';
+include_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
load_all_script();
diff --git a/html/style-classic7.css b/html/style-classic7.css
index ddbaf862c..51105a1e9 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -837,7 +837,7 @@ div.topmenu {
.topmenu table {
border-collapse:collapse;
border-spacing:1px;
-
+ width:100%;
}
@media only screen and (max-width:320px) {
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index bb8147022..a6838287b 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -402,19 +402,21 @@ if ($histo->selected == 4 || $histo->selected == 5)
echo _('Filtre rapide:').HtmlInput::filter_table($id, '0,1,2', '1');
echo '';
echo tr(
- th('Quick Code') .
- th('Libellé') .
- '| Poste'.Icon_Action::infobulle(27).' | '.
- th('Débit', 'style="text-align:right"') .
- th('Crédit', 'style="text-align:right"') .
- th('Solde', 'style="text-align:right"') .
- th('D/C', 'style="text-align:right"')
+ th(_('Quick Code')) .
+ th(_('Libellé')) .
+ ''._('Poste').Icon_Action::infobulle(27).' | '.
+ th(_('Débit'), 'style="text-align:right"') .
+ th(_('Crédit'), 'style="text-align:right"') .
+ th(_('Solde'), 'style="text-align:right"') .
+ th(_('D/C'), 'style="text-align:right"')
);
$idx = 0;$sum_deb=0;$sum_cred=0;$sum_solde=0;bcscale(4);
for ($i = 0; $i < Database::num_row($ret); $i++)
{
- $filter = " (j_date >= to_date('" . $_REQUEST['start'] . "','DD.MM.YYYY') " .
- " and j_date <= to_date('" . $_REQUEST['end'] . "','DD.MM.YYYY')) ";
+ $start=$http->request("start",'date');
+ $end=$http->request("end",'date');
+ $filter = " (j_date >= to_date('" . $start. "','DD.MM.YYYY') " .
+ " and j_date <= to_date('" . $end . "','DD.MM.YYYY')) ";
$aCard = Database::fetch_array($ret, $i);
$oCard = new Fiche($cn, $aCard['f_id']);
$solde = $oCard->get_solde_detail($filter);
@@ -482,6 +484,7 @@ echo $export_csv;
echo $export_pdf;
echo $export_print;
$fiche = new Fiche($cn);
+$histo=$http->get("histo","number");
for ($e = 0; $e < count($afiche); $e++)
{
$array = Fiche::get_fiche_def($cn, $afiche[$e]['fd_id'], 'name_asc');
@@ -494,22 +497,22 @@ for ($e = 0; $e < count($afiche); $e++)
$letter->set_parameter('start', $periode_start->value );
$letter->set_parameter('end', $periode_end->value );
// all
- if ($_GET['histo'] == 0)
+ if ($histo== 0)
{
$letter->get_all();
}
// lettered
- if ($_GET['histo'] == 1)
+ if ($histo == 1)
{
$letter->get_letter();
}
// unlettered
- if ($_GET['histo'] == 2)
+ if ($histo == 2)
{
$letter->get_unletter();
}
- if ($_GET['histo'] == 6)
+ if ($histo== 6)
{
$letter->get_letter_diff();
}
@@ -567,7 +570,7 @@ for ($e = 0; $e < count($afiche); $e++)
$prog = bcsub($prog, $row['j_montant']);
}
$side = " " . $fiche->get_amount_side($prog);
- echo td(nbm($prog) . $side, 'style="text-align:right"');
+ echo td(nbm(abs($prog)) . $side, 'style="text-align:right"');
$html_let="";
if ($row['letter']!=-1) {
$span_error = "";