[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 09/16: Mantis #1665: Pouvoir modifier l'ordre
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 09/16: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique |
Date: |
Sun, 3 Feb 2019 14:38:41 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5e5c844f9b1aa6510c30bf3fd3ce4d8bcdc12ffb
Author: Dany De Bontridder <address@hidden>
Date: Mon Jan 28 20:10:01 2019 +0100
Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique
---
include/anc_history.inc.php | 3 +++
include/class/anc_listing.class.php | 24 +++++++++++++-----------
include/class/anc_operation.class.php | 1 +
include/class/anc_print.class.php | 16 +++++++++++-----
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/include/anc_history.inc.php b/include/anc_history.inc.php
index bac4a8b..505927e 100644
--- a/include/anc_history.inc.php
+++ b/include/anc_history.inc.php
@@ -27,6 +27,9 @@ if (isset($_GET['result']))
{
echo $list->show_button();
echo $result;
+ echo '<div></div>';
+ echo $list->show_button();
+
}
else
{
diff --git a/include/class/anc_listing.class.php
b/include/class/anc_listing.class.php
index 999c2fc..9ba5b34 100644
--- a/include/class/anc_listing.class.php
+++ b/include/class/anc_listing.class.php
@@ -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();
diff --git a/include/class/anc_operation.class.php
b/include/class/anc_operation.class.php
index f3c2be8..9726ac3 100644
--- a/include/class/anc_operation.class.php
+++ b/include/class/anc_operation.class.php
@@ -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 ,
diff --git a/include/class/anc_print.class.php
b/include/class/anc_print.class.php
index 5e8ea00..174fb1a 100644
--- a/include/class/anc_print.class.php
+++ b/include/class/anc_print.class.php
@@ -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
- [Noalyss-commit] [noalyss] branch master updated (6956783 -> f39d9ca), Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 01/16: translation, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 03/16: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 02/16: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 10/16: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 14/16: CSS : cosmetic, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 08/16: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 04/16: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 05/16: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 09/16: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 15/16: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 11/16: Mantis #1596: Dans le plan comptable, fiches non cliquables Les fiches sont cliquable dans Plan Comptable , PCMNCFG et dans la liste des postes, en plus on peut obtenir toutes les fiches d'un poste, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 06/16: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 16/16: Bug merge, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 13/16: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 07/16: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2019/02/03
- [Noalyss-commit] [noalyss] 12/16: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2019/02/03