diff --git a/html/do.php b/html/do.php
index b4a08330f..fda7e03e3 100644
--- a/html/do.php
+++ b/html/do.php
@@ -107,7 +107,9 @@ if (DBVERSION > dossier::get_version($cn))
{
echo '
' . _("Votre base de données n'est pas à jour") . ' ';
$a = _("cliquez ici pour appliquer le patch");
- $base = dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php';
+ $base = dirname($_SERVER['REQUEST_URI']);
+ if ($base == '/') { $base = ''; }
+ $base .= '/admin/setup.php';
echo '' . $a . '
';
}
diff --git a/html/js/anc_script.js b/html/js/anc_script.js
index ef5e3bb79..b7a3a94c0 100644
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@@ -37,9 +37,9 @@ function add_row(p_table,p_seq)
var new_value=mytable.rows.length+1;
- if ( mytable.rows.length > 5 )
+ if ( mytable.rows.length > 15 )
{
- alert("Maximum 5 lignes ");
+ alert("Maximum 15 lignes ");
return;
}
amount=compute_total_table(p_table,p_seq);
diff --git a/html/user_login.php b/html/user_login.php
index 12dec1af3..56fe8c5f2 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -74,7 +74,9 @@ if ( $version < DBVERSIONREPO )
{
echo ''._("Votre base de données n'est pas à jour").' ';
$a=_("cliquez ici pour appliquer le patch");
- $base=dirname($_SERVER['REQUEST_URI']).'/admin/setup.php';
+ $base = dirname($_SERVER['REQUEST_URI']);
+ if ($base == '/') { $base = ''; }
+ $base .= '/admin/setup.php';
echo ''.$a.'
';
}
diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php
index f045a2910..71999a6b1 100644
--- a/include/anc_pa.inc.php
+++ b/include/anc_pa.inc.php
@@ -272,8 +272,10 @@ else
''.
"Activités".
"";
-
- echo '';
+ echo '';
+ echo $line['description'];
+ echo ' | ';
+ echo "\n";
}
echo '';
if ($obj->isAppend()==true )
diff --git a/include/class_anc_account.php b/include/class_anc_account.php
index 1acc35f71..fc9c0818a 100644
--- a/include/class_anc_account.php
+++ b/include/class_anc_account.php
@@ -101,9 +101,9 @@ class Anc_Account
if ( strlen($this->name) == 0)
return;
if ( $this->ga_id == null || strlen(trim($this->ga_id)) == 0 )
- $ga_id="NULL";
+ $ga_id=NULL;
else
- $ga_id="'".$this->ga_id."'";
+ $ga_id=$this->ga_id;
$sql="insert into poste_analytique (
po_name ,
pa_id,
diff --git a/include/class_anc_grandlivre.php b/include/class_anc_grandlivre.php
index e37525d06..449dcd0f9 100644
--- a/include/class_anc_grandlivre.php
+++ b/include/class_anc_grandlivre.php
@@ -169,6 +169,7 @@ class Anc_GrandLivre extends Anc_Print
$idx = 0;
$tot_deb = $tot_cred = 0;
+ bcscale(2);
foreach ($array as $row)
{
if ($prev != $row['po_name'])
@@ -178,6 +179,7 @@ class Anc_GrandLivre extends Anc_Print
$r.='';
$tot_solde = bcsub($tot_cred, $tot_deb);
$sign = ($tot_solde > 0) ? 'C' : 'D';
+ $r.=td('') . td('') . td('');
$r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
}
$r.='
' . '' . '' . h($row['po_name'] . ' ' . $row['po_description']) . ' |
';
@@ -244,6 +246,7 @@ class Anc_GrandLivre extends Anc_Print
$r.='';
$tot_solde = bcsub($tot_cred, $tot_deb);
$sign = ($tot_solde > 0) ? 'C' : 'D';
+ $r.=td('') . td('') . td('');
$r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
$r.= '';
@@ -305,4 +308,4 @@ class Anc_GrandLivre extends Anc_Print
$aheader[]=array("title"=>'Credit','type'=>'num');
Impress::array_to_csv($array, $aheader);
}
-}
\ No newline at end of file
+}