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

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-01-18 10:16:51 +01:00
parent 539660a45d
commit 44708ce7d5
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/compta/stats/byratecountry.php
View File

@ -250,8 +250,8 @@ if ($modecompta == 'CREANCES-DETTES')
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>'; print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>'; print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>'; print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0; $i=0;
while($i < 12) while($i < 12)
{ {
@ -292,9 +292,9 @@ if ($resql) {
while ( $obj = $db->fetch_object($resql)) { while ( $obj = $db->fetch_object($resql)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>'; print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) { if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>'; print '<td class="left">'. $langs->trans("Product") . '</td>';
} else { } else {
print '<td align="left">'. $langs->trans("Service") . '</td>'; print '<td class="left">'. $langs->trans("Service") . '</td>';
} }
print '<td>' .$obj->country . '</td>'; print '<td>' .$obj->country . '</td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
@ -312,7 +312,7 @@ if ($resql) {
// Total // Total
print '<tr class="liste_total"><td class="right"></td>'; print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>'; print '<td class="left"></td>';
print '<td></td>'; print '<td></td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);
@ -328,8 +328,8 @@ if ($resql) {
print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>'; print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>'; print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>'; print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0; $i=0;
while($i < 12) while($i < 12)
{ {
@ -371,9 +371,9 @@ if ($resql2) {
while ( $obj = $db->fetch_object($resql2)) { while ( $obj = $db->fetch_object($resql2)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>'; print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) { if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>'; print '<td class="left">'. $langs->trans("Product") . '</td>';
} else { } else {
print '<td align="left">'. $langs->trans("Service") . '</td>'; print '<td class="left">'. $langs->trans("Service") . '</td>';
} }
print '<td>' . $obj->country . '</td>'; print '<td>' . $obj->country . '</td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
@ -391,7 +391,7 @@ if ($resql2) {
// Total // Total
print '<tr class="liste_total"><td class="right"></td>'; print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>'; print '<td class="left"></td>';
print '<td></td>'; print '<td></td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);

32
htdocs/compta/tva/clients.php
View File

@ -347,12 +347,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>'; print '<td class="left">'.$elementcust.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="right">'.$namerate.'</td>'; print '<td align="right">'.$namerate.'</td>';
print '<td align="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountcust.'</td>'; print '<td align="right">'.$amountcust.'</td>';
@ -417,17 +417,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Rate // Rate
print '<td align="right">' . $fields['drate'] . '</td>'; print '<td align="right">' . $fields['drate'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];
@ -553,12 +553,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Print table headers for this quadri - expenses now // Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">'; print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namesup.'</td>'; print '<td class="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>'; print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
@ -610,17 +610,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];

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

@ -336,12 +336,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>'; print '<td class="left">'.$elementcust.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namecust.'</td>'; print '<td class="left">'.$namecust.'</td>';
print '<td align="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountcust.'</td>'; print '<td align="right">'.$amountcust.'</td>';
@ -393,17 +393,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];
@ -529,12 +529,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Print table headers for this quadri - expenses now // Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">'; print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namesup.'</td>'; print '<td class="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>'; print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
@ -574,17 +574,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];