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

Merge remote-tracking branch 'alioth/master' into vincent

Browse source
This commit is contained in:
Dany De Bontridder 2014-07-26 11:21:04 +02:00
commit 7299231380
6 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html/do.php
View file

@ -107,7 +107,9 @@ if (DBVERSION > dossier::get_version($cn))
{
echo '<h2 class="error" style="font-size:12px">' . _("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 hreF="' . $base . '">' . $a . '</a></h2>';
}

4
html/js/anc_script.js
View file

@ -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);

4
html/user_login.php
View file

@ -74,7 +74,9 @@ if ( $version < DBVERSIONREPO )
{
echo '<h2 class="error" style="font-size:12px">'._("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 hreF="'.$base.'">'.$a.'</a></h2>';
}

6
include/anc_pa.inc.php
View file

@ -272,8 +272,10 @@ else
'<a class="mtitle" href="?ac='.$_REQUEST['ac'].'&sa=list&pa_id='.$line['id'].'&'.$str_dossier.'">'.
"Activités".
"</a>";
echo '</TR>';
echo '<TD>';
echo $line['description'];
echo '</TD>';
echo "</TR>\n";
}
echo '</table>';
if ($obj->isAppend()==true )

4
include/class_anc_account.php
View file

@ -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,

5
include/class_anc_grandlivre.php
View file

@ -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.='<tr>';
$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.='<tr>' . '<td colspan="7" style="width:auto">' . '<h2>' . h($row['po_name'] . ' ' . $row['po_description']) . '</td></tr>';
@ -244,6 +246,7 @@ class Anc_GrandLivre extends Anc_Print
$r.='<tr>';
$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.= '</table>';
@ -305,4 +308,4 @@ class Anc_GrandLivre extends Anc_Print
$aheader[]=array("title"=>'Credit','type'=>'num');
Impress::array_to_csv($array, $aheader);
}
}
}