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

Merge pull request #2332 from aspangaro/3.7-patch1

Browse Source 
FIXED Review
This commit is contained in:
Laurent Destailleur 2015-02-08 00:03:11 +01:00
commit 2c730bf61c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/resultat/index.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/compta/resultat/index.php
* \brief Page reporting resultat
* \brief Page reporting result
*/
require '../../main.inc.php';
@ -570,8 +570,8 @@ print '</tr>';
print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
print '<td align="right">'.$langs->trans("Outcome").'</td>';
print '<td align="right" class="borderrightlight">'.$langs->trans("Income").'</td>';
print '<td align="center">'.$langs->trans("Outcome").'</td>';
print '<td align="center" class="borderrightlight">'.$langs->trans("Income").'</td>';
}
print '</tr>';
@ -634,7 +634,7 @@ print "</tr>\n";
// Balance
$var=!$var;
print '<tr class="liste_total"><td>'.$langs->trans("Profit").'</td>';
print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
print '<td align="right" colspan="2" class="borderrightlight"> ';

1
htdocs/compta/tva/quadri_detail.php
View File

@ -41,6 +41,7 @@ $langs->load("bills");
$langs->load("compta");
$langs->load("companies");
$langs->load("products");
$langs->load("other");
// Date range
$year=GETPOST("year");

1
htdocs/langs/en_US/compta.lang
View File

@ -29,6 +29,7 @@ ReportTurnover=Turnover
PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
PaymentsNotLinkedToUser=Payments not linked to any user
Profit=Profit
AccountingResult=Accounting result
Balance=Balance
Debit=Debit
Credit=Credit