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 ''; print ''; -print ''; -print ''; +print ''; +print ''; $i=0; while($i < 12) { @@ -292,9 +292,9 @@ if ($resql) { while ( $obj = $db->fetch_object($resql)) { print ''; if ($obj->product_type == 0) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; 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 ''; -print ''; -print ''; +print ''; +print ''; $i=0; while($i < 12) { @@ -371,9 +371,9 @@ if ($resql2) { while ( $obj = $db->fetch_object($resql2)) { print ''; if ($obj->product_type == 0) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; 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 ''; - print ''; - print ''; - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; + print ''; + print ''; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; else print ''; print ''; - print ''; + print ''; if ($modetax != 1) { print ''; @@ -417,17 +417,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Invoice date - print ''; + print ''; // Payment date - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; else print ''; // Rate print ''; // Description - print ''; - print ''; - print ''; - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; + print ''; + print ''; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; else print ''; - print ''; - print ''; + print ''; + print ''; if ($modetax != 1) { print ''; print ''; @@ -610,17 +610,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Invoice date - print ''; + print ''; // Payment date - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; else print ''; // Company name - print ''; + print ''; // Description - print ''; - print ''; - print ''; - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; + print ''; + print ''; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; else print ''; - print ''; - print ''; + print ''; + print ''; if ($modetax != 1) { print ''; @@ -393,17 +393,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Invoice date - print ''; + print ''; // Payment date - if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; + if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''; else print ''; // Company name - print ''; + print ''; // Description - print ''; - print ''; - print ''; - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; + print ''; + print ''; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; else print ''; - print ''; - print ''; + print ''; + print ''; if ($modetax != 1) { print ''; print ''; @@ -574,17 +574,17 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Invoice date - print ''; + print ''; // Payment date - if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; + if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print ''; else print ''; // Company name - print ''; + print ''; // Description - print '
' . $langs->trans("TurnoverbyVatrate") . '' . $langs->trans("ProductOrService") . '' . $langs->trans("Country") . '' . $langs->trans("ProductOrService") . '' . $langs->trans("Country") . '
' . vatrate($obj->vatrate) . ''. $langs->trans("Product") . ''. $langs->trans("Product") . ''. $langs->trans("Service") . ''. $langs->trans("Service") . '' .$obj->country . '
' . $langs->trans("PurchasebyVatrate") . '' . $langs->trans("ProductOrService") . '' . $langs->trans("Country") . '' . $langs->trans("ProductOrService") . '' . $langs->trans("Country") . '
' . vatrate($obj->vatrate) . ''. $langs->trans("Product") . ''. $langs->trans("Product") . ''. $langs->trans("Service") . ''. $langs->trans("Service") . '' . $obj->country . '
'.$elementcust.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$elementcust.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$namerate.''.$productcust.''.$productcust.''.$amountcust.''.$fields['link'].'' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . $fields['drate'] . ''; + 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.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$elementsup.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$namesup.''.$productsup.''.$namesup.''.$productsup.''.$amountsup.''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'.$fields['link'].'' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . $fields['company_link'] . '' . $fields['company_link'] . ''; + 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.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$elementcust.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$namecust.''.$productcust.''.$namecust.''.$productcust.''.$amountcust.''.$fields['link'].'' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . $fields['company_link'] . '' . $fields['company_link'] . ''; + 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.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$elementsup.''.$langs->trans("DateInvoice").''.$langs->trans("DatePayment").''.$namesup.''.$productsup.''.$namesup.''.$productsup.''.$amountsup.''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'.$fields['link'].'' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datef'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . dol_print_date($fields['datep'], 'day') . '' . $fields['company_link'] . '' . $fields['company_link'] . ''; + print ''; if ($fields['pid']) { $product_static->id=$fields['pid'];