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

Fix cosmetic

Browse source
This commit is contained in:
Dany De Bontridder 2010-07-04 14:53:43 +00:00
parent 17f47091d9
commit 77f1f88817
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/class_acc_reconciliation.php
View file

@ -168,7 +168,7 @@ class Acc_Reconciliation {
return $r;
}
function fill_info() {
$sql="select jr_id,jr_date,jr_comment,jr_internal,jr_montant,jr_pj,jr_def_id,jrn_def_name,jrn_def_type
$sql="select jr_id,jr_date,jr_comment,jr_internal,jr_montant,jr_pj_number,jr_def_id,jrn_def_name,jrn_def_type
from jrn join jrn_def on (jrn_def_id=jr_def_id)
where jr_id=$1";
$a=$this->db->get_array($sql,array($this->jr_id));
@ -185,7 +185,7 @@ class Acc_Reconciliation {
@endcode
*/
function get_not_reconciled($pa_jrn) {
$array=$this->db->get_array("select distinct jr_id from jrn where jr_id not in (select jr_id from jrn_rapt union select jra_concerned from jrn_rapt)");
$array=$this->db->get_array("select distinct jr_id,jr_date from jrn where jr_id not in (select jr_id from jrn_rapt union select jra_concerned from jrn_rapt) order by jr_date");
$ret=array();
for ($i=0;$i<count($array);$i++) {
$this->jr_id=$array[$i]['jr_id'];
@ -206,7 +206,7 @@ class Acc_Reconciliation {
*/
function get_reconciled($pa_jrn)
{
$array=$this->db->get_array("select distinct jr_id from jrn where jr_id in (select jr_id from jrn_rapt union select jra_concerned from jrn_rapt)");
$array=$this->db->get_array("select distinct jr_id,jr_date from jrn where jr_id in (select jr_id from jrn_rapt union select jra_concerned from jrn_rapt) order by jr_date");
$ret=array();
for ($i=0;$i<count($array);$i++) {
$this->jr_id=$array[$i]['jr_id'];

4
include/template/impress_reconciliation.php
View file

@ -27,7 +27,7 @@ for ($i=0;$i<count($array);$i++) {
$detail=sprintf('<a class="detail" href="javascript:modifyOperation(\'%s\',%d)">%s</a>',
$array[$i]['first']['jr_id'],$gDossier,$array[$i]['first']['jr_internal']);
$r.=td($detail);
$r.=td($array[$i]['first']['jr_pj']);
$r.=td($array[$i]['first']['jr_pj_number']);
$r.=td($array[$i]['first']['jr_comment']);
$r.=td($array[$i]['first']['jr_montant']);
echo tr($r);
@ -41,7 +41,7 @@ for ($i=0;$i<count($array);$i++) {
$detail=sprintf('<a class="detail" href="javascript:modifyOperation(\'%s\',%d)">%s</a>',
$array[$i]['depend'][$e]['jr_id'],$gDossier,$array[$i]['depend'][$e]['jr_internal']);
$r.=td($detail);
$r.=td($array[$i]['depend'][$e]['jr_pj']);
$r.=td($array[$i]['depend'][$e]['jr_pj_number']);
$r.=td($array[$i]['depend'][$e]['jr_comment']);
$r.=td($array[$i]['depend'][$e]['jr_montant']);
if ( $e==$limit)

5
include/template/ledger_detail_ach.php
View file

@ -12,7 +12,7 @@
<? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',$jr_id).dossier::hidden();?>
<table>
<tr>
<? echo td('Date').td($obj->det->jr_date);?>
<? echo td('Date').td(format_date($obj->det->jr_date));?>
</tr>
<tr>
@ -48,6 +48,7 @@ echo td(_('Libellé')).td($itext->input(),' colspan="2" ');
<fieldset><legend><?=_('Détail')?></legend>
<table class="result">
<?
bcscale(2);
$total_htva=0;$total_tvac=0;
echo th(_('Quick Code'));
echo th(_('Description'));
@ -83,7 +84,7 @@ echo '</tr>';
$fiche->id, $gDossier, $fiche->strAttribut(ATTR_DEF_QUICKCODE));
$row=td($view_history);
$sym_tva='noe';
$sym_tva='';
if ( $owner->MY_TVA_USE=='Y') {
/* retrieve TVA symbol */
$tva=new Acc_Tva($cn,$q['qp_vat_code']);

3
include/template/ledger_detail_ven.php
View file

@ -12,7 +12,7 @@
<? echo HtmlInput::hidden('whatdiv',$div).HtmlInput::hidden('jr_id',$jr_id).dossier::hidden();?>
<table>
<tr>
<? echo td('Date').td($obj->det->jr_date);?>
<? echo td('Date').td(format_date($obj->det->jr_date));?>
</tr>
<tr>
@ -48,6 +48,7 @@ echo td(_('Libellé')).td($itext->input(),' colspan="2" ');
<fieldset><legend><?=_('Détail')?></legend>
<table class="result">
<?
bcscale(2);
$total_htva=0;$total_tvac=0;
echo th(_('Quick Code'));
echo th(_('Description'));