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

Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique

Browse source
This commit is contained in:
Dany De Bontridder 2019-01-28 20:10:01 +01:00
parent e8c2f57765
commit 5e5c844f9b
4 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/anc_history.inc.php
View file

@ -27,6 +27,9 @@ if (isset($_GET['result']))
{
echo $list->show_button();
echo $result;
echo '<div></div>';
echo $list->show_button();
}
else
{

24
include/class/anc_listing.class.php
View file

@ -72,9 +72,11 @@ class Anc_Listing extends Anc_Print
}
$cred=0;$deb=0;
bcscale(2);
$r.= '<table class="result" style="width=100%">';
$r.='<div></div>';
$r.=_('Cherche').HtmlInput::filter_table("tb_anchop",'0,1,2,3,4,5,6,7',1);
$r.= '<table id="tb_anchop" class="sortable" >';
$r.= '<tr>'.
'<th>'._('Date').'</th>'.
'<th class=" sorttable_sorted">'._('Date').'</th>'.
'<th>'._('Poste').'</th>'.
'<th>'._('Quick_code').'</th>'.
'<th>'._('Analytique').'</th>'.
@ -94,14 +96,14 @@ class Anc_Listing extends Anc_Print
$card_detail=($row['f_id'] != null)?HtmlInput::history_card($row['f_id'],$row['qcode']):'';
$r.=
'<td>'.$row['oa_date'].'</td>'.
td($post_detail).
'<td sorttable_customkey="'.$row['str_order_date'].'">'.$row['oa_date'].'</td>'.
td($post_detail,' sorttable_customkey="X'.$row['j_poste'].'"').
td($card_detail).
'<td>'.HtmlInput::history_anc_account($row['po_id'],h($row['po_name'])).'</td>'.
'<td>'.h($row['oa_description']).'</td>'.
td($row['jr_comment']).
'<td>'.$detail.'</td>'.
'<td class="num">'.nbm($row['oa_amount']).'</td>'.
'<td class="num" sorttable_customkey="'.$row['oa_amount'].'">'.nbm($row['oa_amount']).'</td>'.
'<td>'.(($row['oa_debit']=='f')?'C':'D').'</td>';
$r.= '</tr>';
if ( $row['oa_debit'] == 'f') {$cred=bcadd($cred,$row['oa_amount']);}
@ -112,15 +114,15 @@ class Anc_Listing extends Anc_Print
ob_start();
echo _("Total");
echo '<ol style="list-style:none">';
echo '<li>'.nbm($deb).' D '.'</li>';
echo '<li>'.nbm($cred).' C '.'</li>';
echo '<li>'._('Total')." ".nbm($deb).' D '.'</li>';
echo '<li>'._('Total')." ".nbm($cred).' C '.'</li>';
echo '<li>';
echo _('Solde');
$solde=abs(bcsub($deb,$cred));
echo $solde;
if ( $cred == $deb ) echo " = ";
else if ( $cred > $deb ) echo " C ";
else echo ' D ';
echo $solde." ";
echo findSide($deb-$cred);
echo '<li>';
echo '</ol>';
$r_solde=ob_get_clean();

1
include/class/anc_operation.class.php
View file

@ -221,6 +221,7 @@ class Anc_Operation
po_description,
oa_debit,
(case when jr_date is not null then to_char(jr_date,'DD.MM.YYYY') else to_char(oa_date,'DD.MM.YYYY') end ) as oa_date,
(case when jr_date is not null then to_char(jr_date,'YYYYMMDD') else to_char(oa_date,'YYYYMMDD') end ) as str_order_date,
oa_amount,
oa_group,
j_id ,

16
include/class/anc_print.class.php
View file

@ -148,8 +148,6 @@ class Anc_Print
echo $from->input();
?>
</td>
</tr>
<tr>
<td>
<?php
echo _('Jusque') ;
@ -161,13 +159,21 @@ class Anc_Print
echo $to->input();
?>
</td>
<td>
<?php echo _( "Plan Analytique ")?>
</td>
<td>
<?php
echo $plan_id->input();
echo Icon_Action::infobulle(42);
?>
</td>
</tr>
</table>
<span style="padding:5px;margin:5px;display:block;">
<?php echo _( "Plan Analytique :").$plan_id->input();
echo Icon_Action::infobulle(42);
?>
</span>
<?php