Skip to content

Commit

Permalink
update with html5 compliant code
Browse files Browse the repository at this point in the history
  • Loading branch information
@grandoc
grandoc committed Jan 18, 2019
1 parent 539660a commit 44708ce
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
20 changes: 10 additions & 10 deletions htdocs/compta/stats/byratecountry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@

print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>';
print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0;
while($i < 12)
{
Expand Down Expand Up @@ -292,9 +292,9 @@
while ( $obj = $db->fetch_object($resql)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>';
print '<td class="left">'. $langs->trans("Product") . '</td>';
} else {
print '<td align="left">'. $langs->trans("Service") . '</td>';
print '<td class="left">'. $langs->trans("Service") . '</td>';
}
print '<td>' .$obj->country . '</td>';
for($i = 0; $i < 12; $i++) {
Expand All @@ -312,7 +312,7 @@

// Total
print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>';
print '<td class="left"></td>';
print '<td></td>';
for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);
Expand All @@ -328,8 +328,8 @@


print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>';
print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0;
while($i < 12)
{
Expand Down Expand Up @@ -371,9 +371,9 @@
while ( $obj = $db->fetch_object($resql2)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>';
print '<td class="left">'. $langs->trans("Product") . '</td>';
} else {
print '<td align="left">'. $langs->trans("Service") . '</td>';
print '<td class="left">'. $langs->trans("Service") . '</td>';
}
print '<td>' . $obj->country . '</td>';
for($i = 0; $i < 12; $i++) {
Expand All @@ -391,7 +391,7 @@

// Total
print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>';
print '<td class="left"></td>';
print '<td></td>';
for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);
Expand Down
32 changes: 16 additions & 16 deletions htdocs/compta/tva/clients.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,12 @@

// Customers invoices
print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>';
print '<td align="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>';
print '<td class="left">'.$elementcust.'</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 class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>';
print '<td align="right">'.$namerate.'</td>';
print '<td align="left">'.$productcust.'</td>';
print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1)
{
print '<td align="right">'.$amountcust.'</td>';
Expand Down Expand Up @@ -417,17 +417,17 @@
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';

// 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
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>';

// Rate
print '<td align="right">' . $fields['drate'] . '</td>';

// Description
print '<td align="left">';
print '<td class="left">';
if ($fields['pid'])
{
$product_static->id=$fields['pid'];
Expand Down Expand Up @@ -553,12 +553,12 @@

// Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>';
print '<td align="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>';
print '<td class="left">'.$elementsup.'</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 class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>';
print '<td align="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>';
print '<td class="left">'.$namesup.'</td>';
print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
Expand Down Expand Up @@ -610,17 +610,17 @@
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';

// 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
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>';

// Company name
print '<td align="left">' . $fields['company_link'] . '</td>';
print '<td class="left">' . $fields['company_link'] . '</td>';

// Description
print '<td align="left">';
print '<td class="left">';
if ($fields['pid'])
{
$product_static->id=$fields['pid'];
Expand Down
36 changes: 18 additions & 18 deletions htdocs/compta/tva/quadri_detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,12 @@

// Customers invoices
print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>';
print '<td align="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>';
print '<td class="left">'.$elementcust.'</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 class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>';
print '<td align="left">'.$namecust.'</td>';
print '<td align="left">'.$productcust.'</td>';
print '<td class="left">'.$namecust.'</td>';
print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1)
{
print '<td align="right">'.$amountcust.'</td>';
Expand Down Expand Up @@ -393,17 +393,17 @@
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';

// 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
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>';

// Company name
print '<td align="left">' . $fields['company_link'] . '</td>';
print '<td class="left">' . $fields['company_link'] . '</td>';

// Description
print '<td align="left">';
print '<td class="left">';
if ($fields['pid'])
{
$product_static->id=$fields['pid'];
Expand Down Expand Up @@ -529,12 +529,12 @@

// Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>';
print '<td align="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>';
print '<td class="left">'.$elementsup.'</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 class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>';
print '<td align="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>';
print '<td class="left">'.$namesup.'</td>';
print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
Expand Down Expand Up @@ -574,17 +574,17 @@
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';

// 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
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>';

// Company name
print '<td align="left">' . $fields['company_link'] . '</td>';
print '<td class="left">' . $fields['company_link'] . '</td>';

// Description
print '<td align="left">';
print '<td class="left">';
if ($fields['pid'])
{
$product_static->id=$fields['pid'];
Expand Down

0 comments on commit 44708ce

Please sign in to comment.