[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 01/08: Task #1043 - BK : met les montants en
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 01/08: Task #1043 - BK : met les montants en rouge si compte en négatif |
Date: |
Fri, 07 Nov 2014 21:59:22 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 4f13570176194bad0635db8010cfe7688a99ab1b
Author: Dany De Bontridder <address@hidden>
Date: Fri Nov 7 20:12:08 2014 +0100
Task #1043 - BK : met les montants en rouge si compte en négatif
---
include/class_fiche.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/include/class_fiche.php b/include/class_fiche.php
index 6b886a3..b331c7f 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -1512,7 +1512,7 @@ class Fiche
* \brief show the default screen
*
* \param $p_search (filter)
- * \param $p_action show the action column
+ * \param $p_action used for specific action bank, red if credit < debit
* \param $p_sql SQL to filter the number of card must start with AND
* \param $p_amount true : only cards with at least one operation default
: false
* \return: string to display
@@ -1560,7 +1560,7 @@ class Fiche
if ( $all_tiers == 0 || count($step_tiers)==0 ) return "";
$r="";
- $r.="Filtre rapide ".HtmlInput::filter_table("tiers_tb", '0,1', 1);
+ $r.=_("Filtre rapide ").HtmlInput::filter_table("tiers_tb", '0,1', 1);
$r.=$bar;
$r.='<table id="tiers_tb" class="sortable"
style="width:90%;margin-left:5%">
@@ -1580,15 +1580,21 @@ class Fiche
foreach ($step_tiers as $tiers )
{
$i++;
- $odd="";
- $odd = ($i % 2 == 0 ) ? 'class="odd"': ' class="even" ';
- /* Filter on the default year */
-
- $amount=$tiers->get_solde_detail($filter_year);
+
+ /* Filter on the default year */
+ $amount=$tiers->get_solde_detail($filter_year);
/* skip the tiers without operation */
if ( $p_amount && $amount['debit']==0 && $amount['credit'] == 0 &&
$amount['solde'] == 0 ) continue;
+ $odd="";
+ $odd = ($i % 2 == 0 ) ? ' odd ': ' even ';
+ if ( $p_action == 'bank' && $amount['debit'] < $amount['credit']
){
+ //put in red if c>d
+ $odd.=" notice ";
+ }
+ $odd=' class="'.$odd.'"';
+
$r.="<TR $odd>";
$e=sprintf('<A HREF="%s?ac=%s&sb=detail&f_id=%d&%s&sc=sv"
title="Détail" class="line"> ',
$script,$_REQUEST['ac'],$tiers->id,$str_dossier);
- [Noalyss-commit] [noalyss] branch master updated (0b85235 -> 58f5512), Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 02/08: Task #1043 - BK : met les montants en rouge si compte en négatif, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 04/08: fix bug, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 05/08: fix cosmetic bug : remove width set by JS, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 06/08: Task #639 - Traduction : anglais translation, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 08/08: Ajout poste comptable, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 01/08: Task #1043 - BK : met les montants en rouge si compte en négatif,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 03/08: fix bug, Dany De Bontridder, 2014/11/07
- [Noalyss-commit] [noalyss] 07/08: Task #639 - Traduction : anglais translation, Dany De Bontridder, 2014/11/07