Skip to content

Commit

Permalink
Fix Presentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@aspangaro
aspangaro committed Jul 29, 2016
1 parent 45d354a commit 3c3df0c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 24 deletions.
4 changes: 2 additions & 2 deletions htdocs/compta/salaries/index.php
View file
@@ -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>
*
Expand Down Expand Up @@ -221,7 +221,7 @@
}

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>";
Expand Down
25 changes: 11 additions & 14 deletions htdocs/expensereport/card.php
View file
Expand Up @@ -1786,24 +1786,21 @@
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>';

Expand All @@ -1826,29 +1823,29 @@
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é
Expand Down
4 changes: 2 additions & 2 deletions htdocs/societe/project.php
View file
Expand Up @@ -94,7 +94,7 @@

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>';
Expand All @@ -103,7 +103,7 @@

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>';
Expand Down
12 changes: 6 additions & 6 deletions htdocs/societe/rib.php
View file
Expand Up @@ -521,7 +521,7 @@
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>';
Expand Down Expand Up @@ -586,12 +586,12 @@
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>';
}
Expand All @@ -600,7 +600,7 @@

dol_fiche_end();

print '<div align="center">';
print '<div class="center">';
print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input name="cancel" class="button" value="'.$langs->trans("Cancel").'" type="submit">';
Expand Down

0 comments on commit 3c3df0c

Please sign in to comment.