[Noalyss-commit] [noalyss] 04/08: Merge branch 'master' of ssh://ns3git/srv/git/noalyss

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit e98c5d7e7abaf4a8005e241402f7446ad17e1b60
Merge: b48c28f 8fc2ff7
Author: Dany De Bontridder <address@hidden>
Date:   Sat Mar 25 23:23:40 2017 +0100

    Merge branch 'master' of ssh://ns3git/srv/git/noalyss

 html/install.php                        |   6 +
 html/js/sorttable.js                    | 938 +++++++++++++++++---------------
 html/lang/en_US/LC_MESSAGES/messages.po | 733 ++++++++++++++++---------
 html/lang/messages.po                   | 723 ++++++++++++++++--------
 html/lang/nl_NL/LC_MESSAGES/messages.po | 731 +++++++++++++++++--------
 html/popup.php                          |  15 +-
 include/ajax/ajax_navigator.php         |   2 +-
 include/balance.inc.php                 |   2 +-
 include/card_attr.inc.php               |   2 +-
 include/class/class_fiche.php           |   2 +-
 include/class/class_user.php            |   6 +-
 include/compta_fin_rec.inc.php          |   3 +-
 include/compta_fin_saldo.inc.php        |   2 +-
 include/lib/ac_common.php               |   1 +
 include/template/dashboard.php          |   2 +-
 15 files changed, 1984 insertions(+), 1184 deletions(-)

diff --cc include/compta_fin_saldo.inc.php
index 0e1d9fa,10276ac..a63698e
--- a/include/compta_fin_saldo.inc.php
+++ b/include/compta_fin_saldo.inc.php
@@@ -36,8 -36,8 +36,8 @@@ require_once  NOALYSS_INCLUDE.'/class/c
      echo '<div class="content">';
      echo dossier::hidden();
      echo _('Cherche').' : '.HtmlInput::filter_table("fin_saldo_tb", 
'0,1,2,3', '1');
 -    echo '<table class="sortable"  style="margin-left:10%;width:80%" 
class="result" id="fin_saldo_tb">';
 +    echo '<table class="sortable"  style="margin-left:2%;width:96%" 
class="result" id="fin_saldo_tb">';
-     echo tr(th('Quick Code',' class=" 
sorttable_sorted_reverse"',HtmlInput::infobulle(17).'<span 
id="sorttable_sortrevind">&nbsp;&blacktriangle;</span>')
+     echo tr(th('Quick Code',' class=" 
sorttable_sorted"',HtmlInput::infobulle(17).'<span 
id="sorttable_sortfwdind"><img src="image/up.gif"></span>')
              .th('Compte en banque',' style="text-align:left"')
              .th('Journal',' style="text-align:center"')
              .th('Description',' style="text-align:center"')