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 @@ +/* Copyright (C) 2011-2016 Alexandre Spangaro * Copyright (C) 2015-2016 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry * @@ -221,7 +221,7 @@ if ($result) } print ''.$langs->trans("Total").''; - print ''.price($total,0,$outputlangs,1,-1,-1,$conf->currency).""; + print ''.price($total).""; print ""; print ""; 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 ''; - print ''; - //print ''.$langs->trans('Date').''; + print ''.$langs->trans('Date').''; if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').''; print ''.$langs->trans('Type').''; print ''.$langs->trans('Description').''; - print ''.$langs->trans('VAT').''; - print ''.$langs->trans('PriceUTTC').''; - print ''.$langs->trans('Qty').''; + print ''.$langs->trans('VAT').''; + print ''.$langs->trans('PriceUTTC').''; + print ''.$langs->trans('Qty').''; print ''; print ''; print ''; - print ''; - // Select date - print ''; + print ''; $form->select_date($date?$date:-1,'date'); print ''; @@ -1826,29 +1823,29 @@ else print ''; // Select VAT - print ''; + print ''; $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 ''; // Unit price - print ''; + print ''; print ''; print ''; // Quantity - print ''; + print ''; print ''; print ''; if ($action != 'editline') { - print ''; - print ''; + print ''; + print ''; } - print ''; + print ''; print ''; } // 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 ''; + print ''; print $langs->trans('CustomerCode').''; print $object->code_client; if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; @@ -103,7 +103,7 @@ if ($socid) if ($object->fournisseur) { - print ''; + print ''; print $langs->trans('SupplierCode').''; print $object->code_fournisseur; if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 58693b59d5b..a92fa7aad25 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -587,11 +587,11 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) // RUM print ''.$langs->trans("RUM").''; - print ''.$langs->trans("RUMWillBeGenerated").''; + print ''.$langs->trans("RUMWillBeGenerated").''; // FRSTRECUR print ''.$langs->trans("WithdrawMode").''; - print ''; + print ''; print ''; } @@ -600,7 +600,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print '';