diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php index e4fecab5060..df199d2e23e 100644 --- a/htdocs/compta/stats/byratecountry.php +++ b/htdocs/compta/stats/byratecountry.php @@ -250,8 +250,8 @@ if ($modecompta == 'CREANCES-DETTES') print '
| ' . $langs->trans("TurnoverbyVatrate") . ' | '; -print '' . $langs->trans("ProductOrService") . ' | '; -print '' . $langs->trans("Country") . ' | '; +print '' . $langs->trans("ProductOrService") . ' | '; +print '' . $langs->trans("Country") . ' | '; $i=0; while($i < 12) { @@ -292,9 +292,9 @@ if ($resql) { while ( $obj = $db->fetch_object($resql)) { print '||||||||||||||||||
| ' . vatrate($obj->vatrate) . ' | '; if ($obj->product_type == 0) { - print ''. $langs->trans("Product") . ' | '; + print ''. $langs->trans("Product") . ' | '; } else { - print ''. $langs->trans("Service") . ' | '; + print ''. $langs->trans("Service") . ' | '; } print '' .$obj->country . ' | '; for($i = 0; $i < 12; $i++) { @@ -312,7 +312,7 @@ if ($resql) { // Total print '|||||||||||||||||
| '; - print ' | '; + print ' | '; print ' | '; for($i = 0; $i < 12; $i++) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); @@ -328,8 +328,8 @@ if ($resql) { print ' | |||||||||||||||||||
| ' . $langs->trans("PurchasebyVatrate") . ' | '; -print '' . $langs->trans("ProductOrService") . ' | '; -print '' . $langs->trans("Country") . ' | '; +print '' . $langs->trans("ProductOrService") . ' | '; +print '' . $langs->trans("Country") . ' | '; $i=0; while($i < 12) { @@ -371,9 +371,9 @@ if ($resql2) { while ( $obj = $db->fetch_object($resql2)) { print '||||||||||||||||||
| ' . vatrate($obj->vatrate) . ' | '; if ($obj->product_type == 0) { - print ''. $langs->trans("Product") . ' | '; + print ''. $langs->trans("Product") . ' | '; } else { - print ''. $langs->trans("Service") . ' | '; + print ''. $langs->trans("Service") . ' | '; } print '' . $obj->country . ' | '; for($i = 0; $i < 12; $i++) { @@ -391,7 +391,7 @@ if ($resql2) { // Total print '|||||||||||||||||
| '; - print ' | '; + print ' | '; print ' | '; for($i = 0; $i < 12; $i++) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 74a08d0d142..45b93692e3a 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -347,12 +347,12 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Customers invoices print ' | |||||||||||||||||||
| '.$elementcust.' | '; - print ''.$langs->trans("DateInvoice").' | '; - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; + print ''.$elementcust.' | '; + print ''.$langs->trans("DateInvoice").' | '; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; else print ''; print ' | '.$namerate.' | '; - print ''.$productcust.' | '; + print ''.$productcust.' | '; if ($modetax != 1) { print ''.$amountcust.' | '; @@ -417,17 +417,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$fields['link'].' | '; // Invoice date - print '' . dol_print_date($fields['datef'], 'day') . ' | '; + print '' . dol_print_date($fields['datef'], 'day') . ' | '; // Payment date - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; else print ''; // Rate print ' | ' . $fields['drate'] . ' | '; // Description - print ''; + print ' | '; if ($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 ' | |||
| '.$elementsup.' | '; - print ''.$langs->trans("DateInvoice").' | '; - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; + print ''.$elementsup.' | '; + print ''.$langs->trans("DateInvoice").' | '; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; else print ''; - print ' | '.$namesup.' | '; - print ''.$productsup.' | '; + print ''.$namesup.' | '; + print ''.$productsup.' | '; if ($modetax != 1) { print ''.$amountsup.' | '; print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | '; @@ -610,17 +610,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$fields['link'].' | '; // Invoice date - print '' . dol_print_date($fields['datef'], 'day') . ' | '; + print '' . dol_print_date($fields['datef'], 'day') . ' | '; // Payment date - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; else print ''; // Company name - print ' | ' . $fields['company_link'] . ' | '; + print '' . $fields['company_link'] . ' | '; // Description - print ''; + print ' | '; if ($fields['pid']) { $product_static->id=$fields['pid']; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index ff3e3ce127d..a8e22815ea4 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -336,12 +336,12 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Customers invoices print ' |
| '.$elementcust.' | '; - print ''.$langs->trans("DateInvoice").' | '; - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; + print ''.$elementcust.' | '; + print ''.$langs->trans("DateInvoice").' | '; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; else print ''; - print ' | '.$namecust.' | '; - print ''.$productcust.' | '; + print ''.$namecust.' | '; + print ''.$productcust.' | '; if ($modetax != 1) { print ''.$amountcust.' | '; @@ -393,17 +393,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$fields['link'].' | '; // Invoice date - print '' . dol_print_date($fields['datef'], 'day') . ' | '; + print '' . dol_print_date($fields['datef'], 'day') . ' | '; // Payment date - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; else print ''; // Company name - print ' | ' . $fields['company_link'] . ' | '; + print '' . $fields['company_link'] . ' | '; // Description - print ''; + print ' | '; if ($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 ' | |
| '.$elementsup.' | '; - print ''.$langs->trans("DateInvoice").' | '; - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; + print ''.$elementsup.' | '; + print ''.$langs->trans("DateInvoice").' | '; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''.$langs->trans("DatePayment").' | '; else print ''; - print ' | '.$namesup.' | '; - print ''.$productsup.' | '; + print ''.$namesup.' | '; + print ''.$productsup.' | '; if ($modetax != 1) { print ''.$amountsup.' | '; print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | '; @@ -574,17 +574,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$fields['link'].' | '; // Invoice date - print '' . dol_print_date($fields['datef'], 'day') . ' | '; + print '' . dol_print_date($fields['datef'], 'day') . ' | '; // Payment date - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '' . dol_print_date($fields['datep'], 'day') . ' | '; else print ''; // Company name - print ' | ' . $fields['company_link'] . ' | '; + print '' . $fields['company_link'] . ' | '; // Description - print ''; + print ' | '; if ($fields['pid']) { $product_static->id=$fields['pid']; |