From 3c3df0c4f6294516244fea446d3ad258142c3af8 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 29 Jul 2016 23:52:49 +0200
Subject: [PATCH] Fix Presentation
---
htdocs/compta/salaries/index.php | 4 ++--
htdocs/expensereport/card.php | 25 +++++++++++--------------
htdocs/societe/project.php | 4 ++--
htdocs/societe/rib.php | 12 ++++++------
4 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 98278ad374c..f279e97b478 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
@@ -221,7 +221,7 @@ if ($result)
}
print '<tr class="liste_total"><td colspan="6" class="liste_total">'.$langs->trans("Total").'</td>';
- print '<td class="liste_total" align="right">'.price($total,0,$outputlangs,1,-1,-1,$conf->currency)."</td>";
+ print '<td class="liste_total" align="right">'.price($total)."</td>";
print "<td></td></tr>";
print "</table>";
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 8f6dbd43d10..25688bf6e6e 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1786,24 +1786,21 @@ else
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
{
print '<tr class="liste_titre">';
- print '<td colspan="2"></td>';
- //print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
+ print '<td align="center">'.$langs->trans('Date').'</td>';
if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
print '<td align="center">'.$langs->trans('Type').'</td>';
print '<td>'.$langs->trans('Description').'</td>';
- print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
- print '<td style="text-align:right;">'.$langs->trans('PriceUTTC').'</td>';
- print '<td style="text-align:right;">'.$langs->trans('Qty').'</td>';
+ print '<td align="right">'.$langs->trans('VAT').'</td>';
+ print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
+ print '<td align="right">'.$langs->trans('Qty').'</td>';
print '<td colspan="3"></td>';
print '</tr>';
print '<tr '.$bc[true].'>';
- print '<td></td>';
-
// Select date
- print '<td style="text-align:center;">';
+ print '<td align="center">';
$form->select_date($date?$date:-1,'date');
print '</td>';
@@ -1826,29 +1823,29 @@ else
print '</td>';
// Select VAT
- print '<td style="text-align:right;">';
+ print '<td align="right">';
$defaultvat=-1;
if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false);
print '</td>';
// Unit price
- print '<td style="text-align:right;">';
+ print '<td align="right">';
print '<input type="text" size="5" name="value_unit" value="'.$value_unit.'">';
print '</td>';
// Quantity
- print '<td style="text-align:right;">';
+ print '<td align="right">';
print '<input type="text" size="2" name="qty" value="'.($qty?$qty:1).'">';
print '</td>';
if ($action != 'editline')
{
- print '<td style="text-align:right;"></td>';
- print '<td style="text-align:right;"></td>';
+ print '<td align="right"></td>';
+ print '<td align="right"></td>';
}
- print '<td style="text-align:center;"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
+ print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
print '</tr>';
} // Fin si c'est payé/validé
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 6746cf8c522..707fe21a010 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -94,7 +94,7 @@ if ($socid)
if ($object->client)
{
- print '<tr><td>';
+ print '<tr><td class="titlefield">';
print $langs->trans('CustomerCode').'</td><td colspan="3">';
print $object->code_client;
if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
@@ -103,7 +103,7 @@ if ($socid)
if ($object->fournisseur)
{
- print '<tr><td>';
+ print '<tr><td class="titlefield">';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print $object->code_fournisseur;
if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 0d8cdcc1264..436a979ab3f 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -521,7 +521,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">';
- print '<tr><td valign="top" width="25%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+ print '<tr><td valign="top" class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
print '<td colspan="4"><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
@@ -586,12 +586,12 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
print '<table class="border" width="100%">';
// RUM
- print '<tr><td width="35%">'.$langs->trans("RUM").'</td>';
- print '<td colspan="4">'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+ print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
+ print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
// FRSTRECUR
- print '<tr><td width="35%">'.$langs->trans("WithdrawMode").'</td>';
- print '<td colspan="4"><input size="30" type="text" name="frstrecur" value="'.(isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST').'"></td></tr>';
+ print '<tr><td>'.$langs->trans("WithdrawMode").'</td>';
+ print '<td><input size="30" type="text" name="frstrecur" value="'.(isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST').'"></td></tr>';
print '</table>';
}
@@ -600,7 +600,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
dol_fiche_end();
- print '<div align="center">';
+ print '<div class="center">';
print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
print ' ';
print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
--
GitLab