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

Highlight in PRINTPOSTE

Browse source
This commit is contained in:
Dany De Bontridder 2013-10-03 10:56:13 +00:00
parent 75d7bcae4e
commit 6b3537a0f1
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/class_acc_account_ledger.php
View file

@ -150,7 +150,7 @@ class Acc_Account_Ledger
"j_debit, jr_internal,jr_pj_number,
coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
",pcm_lib ".
",jr_tech_per,p_exercice ".
",jr_tech_per,p_exercice,jrn_def_name".
" from jrnx left join jrn_def on (jrn_def_id=j_jrn_def )".
" left join jrn on (jr_grpt_id=j_grpt)".
" left join tmp_pcmn on (j_poste=pcm_val)".
@ -467,7 +467,7 @@ class Acc_Account_Ledger
}
$hid=new IHidden();
echo "<table >";
echo "<table >";
echo '<TR>';
$str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):'';
if ($actiontarget=='poste')

2
include/class_acc_operation.php
View file

@ -252,7 +252,7 @@ class Acc_Operation
$filter_sql=str_replace('jrn_def_id','jr_def_id',$filter_sql);
if ( $this->jr_id==0 ) return;
$sql=" select jr_date,j_qcode,j_poste,j_montant,jr_internal,case when j_debit = 'f' then 'C' else 'D' end as debit,jr_comment as description,
vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ".
vw_name,pcm_lib,j_debit,coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter,jr_def_id ".
" from jrnx join jrn on (jr_grpt_id=j_grpt)
join tmp_pcmn on (j_poste=pcm_val)
left join vw_fiche_attr on (j_qcode=quick_code)

5
include/impress_poste.inc.php
View file

@ -276,14 +276,14 @@ if ( isset( $_REQUEST['bt_html'] ) )
// Detail
//----------------------------------------------------------------------
echo Acc_Account_Ledger::HtmlTableHeader();
echo '<table class="result" style="width:80%;margin-left:10%">';
echo '<table style="width:100%;margin-left:0%">';
foreach ($a_poste as $poste_id )
{
$Poste=new Acc_Account_Ledger ($cn,$poste_id['pcm_val']);
$Poste->load();
$Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode'],$_GET['ople']);
if ( empty($Poste->row)) continue;
echo '<tr><td class="mtitle" style="width:auto" colspan="6"><h2 class="info">'. $poste_id['pcm_val'].' '.h($Poste->label).'</h2></td></tr>';
echo '<tr><td class="mtitle" style="width:auto" colspan="6"><h2 class="title">'. $poste_id['pcm_val'].' '.h($Poste->label).'</h2></td></tr>';
$detail=$Poste->row[0];
@ -294,6 +294,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
/* avoid duplicates */
if ( in_array($detail['jr_id'],$old) == TRUE ) continue;
$old[]=$detail['jr_id'];
echo tr(td("Journal :".$detail['jrn_def_name'],''),'style="width:auto" colspan="6"');
echo '<tr><td class="mtitle" style="width:auto" colspan="6">'. $detail['j_date'].' '.$detail['jr_internal'].' '.hb($detail['description']).' '.hi($detail['jr_pj_number']).'</td></tr>';
$op=new Acc_Operation($cn);