lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on 6.0 look and feel

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-31 18:40:53 +02:00
parent 0bf6356d9c
commit 93687997c9
11 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/stats/index.php
View File

@ -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">';

2
htdocs/comm/propal/stats/index.php
View File

@ -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">';

2
htdocs/commande/stats/index.php
View File

@ -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">';

2
htdocs/compta/deplacement/stats/index.php
View File

@ -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">';

29
htdocs/compta/facture/fiche-rec.php
View File

@ -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;

2
htdocs/compta/facture/stats/index.php
View File

@ -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

2
htdocs/don/stats/index.php
View File

@ -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">';

2
htdocs/expedition/stats/index.php
View File

@ -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">';

2
htdocs/expensereport/stats/index.php
View File

@ -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">';

2
htdocs/fichinter/stats/index.php
View File

@ -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">';

2
htdocs/projet/stats/index.php
View File

@ -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">';