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

CSS on report

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-14 01:03:59 +02:00
parent b90770c30c
commit 56e27d785a
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/compta/resultat/clientfourn.php
View File

@ -338,7 +338,7 @@ else
/* /*
* Factures clients * Factures clients
*/ */
print '<tr><td colspan="4">'.$langs->trans("CustomersInvoices").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("CustomersInvoices").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES') if ($modecompta == 'CREANCES-DETTES')
{ {
@ -500,7 +500,7 @@ else
$sql .= " GROUP BY name, socid"; $sql .= " GROUP BY name, socid";
$sql.= $db->order($sortfield, $sortorder); $sql.= $db->order($sortfield, $sortorder);
print '<tr><td colspan="4">'.$langs->trans("SuppliersInvoices").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SuppliersInvoices").'</td></tr>';
$subtotal_ht = 0; $subtotal_ht = 0;
$subtotal_ttc = 0; $subtotal_ttc = 0;
@ -554,7 +554,7 @@ else
* Charges sociales non deductibles * Charges sociales non deductibles
*/ */
print '<tr><td colspan="4">'.$langs->trans("SocialContributionsNondeductibles").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsNondeductibles").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES') if ($modecompta == 'CREANCES-DETTES')
{ {
@ -630,7 +630,7 @@ else
* Charges sociales deductibles * Charges sociales deductibles
*/ */
print '<tr><td colspan="4">'.$langs->trans("SocialContributionsDeductibles").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsDeductibles").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES') if ($modecompta == 'CREANCES-DETTES')
{ {
@ -727,7 +727,7 @@ else
if (! empty($conf->salaries->enabled)) if (! empty($conf->salaries->enabled))
{ {
print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
{ {
@ -840,7 +840,7 @@ else
$sql.= $db->order($newsortfield, $sortorder); $sql.= $db->order($newsortfield, $sortorder);
} }
print '<tr><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>';
dol_syslog("get expense report outcome"); dol_syslog("get expense report outcome");
$result=$db->query($sql); $result=$db->query($sql);
@ -890,7 +890,7 @@ else
if (! empty($conf->don->enabled)) if (! empty($conf->don->enabled))
{ {
print '<tr><td colspan="4">'.$langs->trans("Donations").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
{ {
@ -972,7 +972,7 @@ else
* VAT * VAT
*/ */
print '<tr><td colspan="4">'.$langs->trans("VAT").'</td></tr>'; print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VAT").'</td></tr>';
$subtotal_ht = 0; $subtotal_ht = 0;
$subtotal_ttc = 0; $subtotal_ttc = 0;

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

@ -893,10 +893,19 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
} }
print '</tr>'; print '</tr>';
print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>'; print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
// Loop on each year to ouput
for ($annee = $year_start ; $annee <= $year_end ; $annee++) for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{ {
print '<td class="liste_titre" align="center">'.$langs->trans("Outcome").'</td>'; print '<td class="liste_titre" align="center">';
print '<td class="liste_titre" align="center" class="borderrightlight">'.$langs->trans("Income").'</td>'; $htmlhelp='';
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("PurchasesPlusVATEarnedAndDue");
print $form->textwithpicto($langs->trans("Outcome"), $htmlhelp);
print '</td>';
print '<td class="liste_titre" align="center" class="borderrightlight">';
$htmlhelp='';
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive");
print $form->textwithpicto($langs->trans("Income"), $htmlhelp);
print '</td>';
} }
print '</tr>'; print '</tr>';
@ -967,7 +976,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{ {
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0); $in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
$out=(isset($totsorties[$annee])?price2num($totsorties[$annee],'MT'):0); $out=(isset($totsorties[$annee])?price2num($totsorties[$annee],'MT'):0);
print price($in-$out).'</td>'; print price(price2num($in-$out, 'MT')).'</td>';
// print '<td>&nbsp;</td>'; // print '<td>&nbsp;</td>';
} }
} }