2
0
forked from Wavyzz/dolibarr

Merge pull request #5675 from aspangaro/4.0-p46

Fix: VAT Area - Problem of presentation
This commit is contained in:
Juanjo Menent
2016-08-31 02:12:19 +02:00
committed by GitHub

View File

@@ -123,17 +123,9 @@ print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>'; print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
print '<br>'; print '<br>';
print '<table width="100%" class="notopnoleftnoright">'; print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td class="notopnoleft" width="50%">';
print load_fiche_titre($langs->trans("VATSummary"), '', '');
// The report mode is the one defined by defaut in tax module setup
//print $modetax;
//print '('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
print '</td><td>';
print load_fiche_titre($langs->trans("VATPaid"), '', '');
print '</td></tr>';
print '<tr><td class="notopnoleft" width="50%" valign="top">'; print load_fiche_titre($langs->trans("VATSummary"), '', '');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@@ -223,18 +215,12 @@ print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("To
print "<td>&nbsp;</td>\n"; print "<td>&nbsp;</td>\n";
print '</tr>'; print '</tr>';
/*}
else
{
print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
print '<tr><td colspan="5">'.$langs->trans("FeatureIsSupportedInInOutModeOnly").'</td></tr>';
}*/
print '</table>'; print '</table>';
print '</td>'; print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
print '<td class="notopnoleftnoright" valign="top" width="50%">';
print load_fiche_titre($langs->trans("VATPaid"), '', '');
/* /*
* Payed * Payed
@@ -250,10 +236,7 @@ $sql.= " GROUP BY dm ORDER BY dm ASC";
pt($db, $sql,$langs->trans("Year")." $y"); pt($db, $sql,$langs->trans("Year")." $y");
print "</td></tr></table>"; print '</div></div>';
print '</td></tr>';
print '</table>';
llxFooter(); llxFooter();
$db->close(); $db->close();