From 93687997c98ef4a60d88aea568f2d2f60f916374 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 18:40:53 +0200
Subject: [PATCH] Work on 6.0 look and feel
---
htdocs/adherents/stats/index.php | 2 +-
htdocs/comm/propal/stats/index.php | 2 +-
htdocs/commande/stats/index.php | 2 +-
htdocs/compta/deplacement/stats/index.php | 2 +-
htdocs/compta/facture/fiche-rec.php | 29 +++++++++++------------
htdocs/compta/facture/stats/index.php | 2 +-
htdocs/don/stats/index.php | 2 +-
htdocs/expedition/stats/index.php | 2 +-
htdocs/expensereport/stats/index.php | 2 +-
htdocs/fichinter/stats/index.php | 2 +-
htdocs/projet/stats/index.php | 2 +-
11 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 6acdd1e56b7..aec8cd588f6 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -141,7 +141,7 @@ if (! $mesg)
$head = member_stats_prepare_head($adh);
-dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), 0, 'user');
+dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 04c1af11e1d..2ec1a3d660b 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -242,7 +242,7 @@ $h++;
complete_head_from_modules($conf,$langs,null,$head,$h,'propal_stats');
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index d900709b835..534011d73fe 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -253,7 +253,7 @@ if ($mode == 'supplier') $type='supplier_order_stats';
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 216988b6a7a..36bc107d672 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -223,7 +223,7 @@ $h++;
complete_head_from_modules($conf,$langs,null,$head,$h,'trip_stats');
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 9d4329a671b..46a7bc299f6 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1637,21 +1637,8 @@ else
print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
- print '<tr class="liste_titre">';
- print_liste_field_titre($langs->trans("Ref"),$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("AmountHT"),$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("DateLastGeneration"),$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("NextDateToExecution"),$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre(''); // Field may contains ling text
- print "</tr>\n";
-
-
// Filters lines
- print '<tr class="liste_titre">';
+ print '<tr class="liste_titre_filter">';
// Ref
if (! empty($arrayfields['f.titre']['checked']))
{
@@ -1756,7 +1743,19 @@ else
print '</td>';
print "</tr>\n";
-
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("AmountHT"),$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("DateLastGeneration"),$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("NextDateToExecution"),$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre(''); // Field may contains ling text
+ print "</tr>\n";
+
+
if ($num > 0)
{
$var=true;
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 5c5aa8489be..767082997d8 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -225,7 +225,7 @@ if ($mode == 'supplier') $type='supplier_invoice_stats';
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
$tmp_companies = $form->select_thirdparty_list($socid,'socid',$filter,1, 0, 0, array(), '', 1);
//Array passed as an argument to Form::selectarray to build a proper select input
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 7da3fadcc6e..b8cd532d35a 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -224,7 +224,7 @@ $type='donation_stats';
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 3dfe5af6b48..f4e8d45f5a1 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -223,7 +223,7 @@ $type='shipment_stats';
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index c81996fda3b..f0448db1771 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -206,7 +206,7 @@ $h++;
complete_head_from_modules($conf,$langs,null,$head,$h,'trip_stats');
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index c053239de1c..e6e1470b47a 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -231,7 +231,7 @@ if ($mode == 'supplier') $type='supplier_order_stats';
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 15a2f3403c4..e9aad0d0b7e 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -271,7 +271,7 @@ $h++;
complete_head_from_modules($conf,$langs,null,$head,$h,$type);
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"), 0, '');
+dol_fiche_head($head,'byyear',$langs->trans("Statistics"), -1, '');
print '<div class="fichecenter"><div class="fichethirdleft">';
--
GitLab