diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 62bb687807c..faf4e914a8f 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -343,8 +343,7 @@ if ($refresh === true) {
$i = 0;
$mcursor = 0;
- while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mcursor is to avoid too large loop
- {
+ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) { // $mcursor is to avoid too large loop
//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
if ($m == 13) $y++;
if ($m > 12) $m -= 12;
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 173f26bcc14..2dada7165b3 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -71,7 +71,7 @@ if ($refresh === false) {
$date_start=dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
$date_end=dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
// Quarter
- if (empty($date_start) || empty($date_end)){ // We define date_start and date_end
+ if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
$q=GETPOST("q", "int");
if (empty($q)) {
if (GETPOST("month", "int")) {
@@ -446,204 +446,199 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$type = 1;
}
- // Payment
- $ratiopaymentinvoice=1;
- if ($modetax != 1)
- {
- if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
- {
- } else {
- if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
- $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
- }
- }
- }
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax != 1) {
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ }
+ }
+ }
- // Total collected
- $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ // Total collected
+ $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
- // VAT
- $temp_vat=$fields['vat']*$ratiopaymentinvoice;
+ // VAT
+ $temp_vat=$fields['vat']*$ratiopaymentinvoice;
- $subtot_coll_total_ht += $temp_ht;
- $subtot_coll_vat += $temp_vat;
- $x_coll_sum += $temp_vat;
- }
- }
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
+ }
+ }
- if ($invoice_type == 'customer' && $vat_rate_show == $rate) {
- if (is_array($x_both[$rate]['coll']['detail'])) {
- foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type = 1;
- }
- if (!empty($fields['ddate_end'])) {
- $type = 1;
- }
+ if ($invoice_type == 'customer' && $vat_rate_show == $rate) {
+ if (is_array($x_both[$rate]['coll']['detail'])) {
+ foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
- print '';
+ print '
';
- // Ref
- print '| ' . $fields['link'] . ' | ';
+ // Ref
+ print '' . $fields['link'] . ' | ';
- // Invoice date
- print '' . dol_print_date($fields['datef'], 'day') . ' | ';
+ // Invoice date
+ 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') . ' | ';
- else print ' | ';
+ // Payment date
+ 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'] . ' | ';
+ // Company name
+ print '' . $fields['company_link'] . ' | ';
- // Description
- print '';
- if ($fields['pid']) {
- $product_static->id = $fields['pid'];
- $product_static->ref = $fields['pref'];
- $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) {
- print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- }
- } else {
- if ($type) {
- $text = img_object($langs->trans('Service'), 'service');
- } else {
- $text = img_object($langs->trans('Product'), 'product');
- }
- if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
- if ($reg[1] == 'DEPOSIT') {
- $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
- } elseif ($reg[1] == 'CREDIT_NOTE') {
- $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
- } else {
- $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
- }
- }
- print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ // Description
+ print ' | ';
+ if ($fields['pid']) {
+ $product_static->id = $fields['pid'];
+ $product_static->ref = $fields['pref'];
+ $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ }
+ } else {
+ if ($type) {
+ $text = img_object($langs->trans('Service'), 'service');
+ } else {
+ $text = img_object($langs->trans('Product'), 'product');
+ }
+ if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+ if ($reg[1] == 'DEPOSIT') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1] == 'CREDIT_NOTE') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- // Show range
- print_date_range($fields['ddate_start'], $fields['ddate_end']);
- }
- print ' | ';
+ // Show range
+ print_date_range($fields['ddate_start'], $fields['ddate_end']);
+ }
+ print '';
- // Total HT
- if ($modetax != 1) {
- print '';
- print price($fields['totalht']);
- if (price2num($fields['ftotal_ttc'])) {
- //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
- $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
- //print ' ('.round($ratiolineinvoice*100,2).'%)';
- }
- print ' | ';
- }
+ // Total HT
+ if ($modetax != 1) {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc'])) {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' | ';
+ }
- // Payment
- $ratiopaymentinvoice = 1;
- if ($modetax != 1) {
- print '';
- //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
- if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
- $payment_static->id = $fields['payment_id'];
- print $payment_static->getNomUrl(2);
- }
- if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
- print $langs->trans("NA");
- } else {
- if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
- $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
- }
- print price(price2num($fields['payment_amount'], 'MT'));
- if (isset($fields['payment_amount'])) {
- print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
- }
- }
- print ' | ';
- }
+ // Payment
+ $ratiopaymentinvoice = 1;
+ if ($modetax != 1) {
+ print '';
+ //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+ if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+ $payment_static->id = $fields['payment_id'];
+ print $payment_static->getNomUrl(2);
+ }
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+ print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+ }
+ print price(price2num($fields['payment_amount'], 'MT'));
+ if (isset($fields['payment_amount'])) {
+ print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+ }
+ }
+ print ' | ';
+ }
- // Total collected
- print '';
- $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
- print price(price2num($temp_ht, 'MT'), 1);
- print ' | ';
+ // Total collected
+ print '';
+ $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+ print price(price2num($temp_ht, 'MT'), 1);
+ print ' | ';
- // VAT
- print '';
- $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
- print price(price2num($temp_vat, 'MT'), 1);
- //print price($fields['vat']);
- print ' | ';
- print '
';
+ // VAT
+ print '';
+ $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+ print price(price2num($temp_vat, 'MT'), 1);
+ //print price($fields['vat']);
+ print ' | ';
+ print '';
- //$subtot_coll_total_ht += $temp_ht;
- //$subtot_coll_vat += $temp_vat;
- //$x_coll_sum += $temp_vat;
- }
- }
- }
- // Total customers for this vat rate
- print '';
- print ' | ';
- print ''.$langs->trans("Total").': | ';
- if ($modetax != 1) {
- print ' | ';
- print ' | ';
- }
- print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
- print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
- print '
';
- }
+ //$subtot_coll_total_ht += $temp_ht;
+ //$subtot_coll_vat += $temp_vat;
+ //$x_coll_sum += $temp_vat;
+ }
+ }
+ }
+ // Total customers for this vat rate
+ print '';
+ print ' | ';
+ print ''.$langs->trans("Total").': | ';
+ if ($modetax != 1) {
+ print ' | ';
+ print ' | ';
+ }
+ print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
+ print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
+ print '
';
+ }
- if (count($x_coll) == 0) // Show a total line if nothing shown
- {
- print '';
- print ' | ';
- print ''.$langs->trans("Total").': | ';
- if ($modetax != 1) {
- print ' | ';
- print ' | ';
- }
- print ''.price(price2num(0, 'MT')).' | ';
- print ''.price(price2num(0, 'MT')).' | ';
- print '
';
- }
+ if (count($x_coll) == 0) { // Show a total line if nothing shown
+ print '';
+ print ' | ';
+ print ''.$langs->trans("Total").': | ';
+ if ($modetax != 1) {
+ print ' | ';
+ print ' | ';
+ }
+ print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
+ print '
';
+ }
- // Blank line
- print '| |
';
+ // Blank line
+ print '| |
';
- // Print table headers for this quadri - expenses now
- print '';
- 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.' | ';
- if ($modetax != 1) {
- print ''.$amountsup.' | ';
- print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
- }
- print ''.$langs->trans("AmountHTVATRealPaid").' | ';
- print ''.$vatsup.' | ';
- print '
'."\n";
+ // Print table headers for this quadri - expenses now
+ print '';
+ 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.' | ';
+ if ($modetax != 1) {
+ print ''.$amountsup.' | ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
+ }
+ print ''.$langs->trans("AmountHTVATRealPaid").' | ';
+ print ''.$vatsup.' | ';
+ print '
'."\n";
- foreach (array_keys($x_paye) as $rate)
- {
- $subtot_paye_total_ht = 0;
- $subtot_paye_vat = 0;
+ foreach (array_keys($x_paye) as $rate) {
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
- if (is_array($x_both[$rate]['paye']['detail']))
- {
+ if (is_array($x_both[$rate]['paye']['detail'])) {
print "";
print '| ';
print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
@@ -664,163 +659,163 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$type = 1;
}
- // Payment
- $ratiopaymentinvoice = 1;
- if ($modetax != 1) {
- if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
- } else {
- if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
- $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
- }
- }
- }
+ // Payment
+ $ratiopaymentinvoice = 1;
+ if ($modetax != 1) {
+ if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
+ } else {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+ $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+ }
+ }
+ }
- // VAT paid
- $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+ // VAT paid
+ $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
- // VAT
- $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+ // VAT
+ $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
- $subtot_paye_total_ht += $temp_ht;
- $subtot_paye_vat += $temp_vat;
- $x_paye_sum += $temp_vat;
- }
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
+ }
- if ($invoice_type == 'supplier' && $vat_rate_show == $rate) {
- foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type = 1;
- }
- if (!empty($fields['ddate_end'])) {
- $type = 1;
- }
+ if ($invoice_type == 'supplier' && $vat_rate_show == $rate) {
+ foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
- print ' |
';
+ print '
';
- // Ref
- print '| ' . $fields['link'] . ' | ';
+ // Ref
+ print '' . $fields['link'] . ' | ';
- // Invoice date
- print '' . dol_print_date($fields['datef'], 'day') . ' | ';
+ // Invoice date
+ 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') . ' | ';
+ // Payment date
+ 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'] . ' | ';
+ // Company name
+ print '' . $fields['company_link'] . ' | ';
- // Description
- print '';
- if ($fields['pid']) {
- $product_static->id = $fields['pid'];
- $product_static->ref = $fields['pref'];
- $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) {
- print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- }
- } else {
- if ($type) {
- $text = img_object($langs->trans('Service'), 'service');
- } else {
- $text = img_object($langs->trans('Product'), 'product');
- }
- if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
- if ($reg[1] == 'DEPOSIT') {
- $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
- } elseif ($reg[1] == 'CREDIT_NOTE') {
- $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
- } else {
- $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
- }
- }
- print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ // Description
+ print ' | ';
+ if ($fields['pid']) {
+ $product_static->id = $fields['pid'];
+ $product_static->ref = $fields['pref'];
+ $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ }
+ } else {
+ if ($type) {
+ $text = img_object($langs->trans('Service'), 'service');
+ } else {
+ $text = img_object($langs->trans('Product'), 'product');
+ }
+ if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+ if ($reg[1] == 'DEPOSIT') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1] == 'CREDIT_NOTE') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- // Show range
- print_date_range($fields['ddate_start'], $fields['ddate_end']);
- }
- print ' | ';
+ // Show range
+ print_date_range($fields['ddate_start'], $fields['ddate_end']);
+ }
+ print '';
- // Total HT
- if ($modetax != 1) {
- print '';
- print price($fields['totalht']);
- if (price2num($fields['ftotal_ttc'])) {
- //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
- $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
- //print ' ('.round($ratiolineinvoice*100,2).'%)';
- }
- print ' | ';
- }
+ // Total HT
+ if ($modetax != 1) {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc'])) {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' | ';
+ }
- // Payment
- $ratiopaymentinvoice = 1;
- if ($modetax != 1) {
- print '';
- if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
- $paymentfourn_static->id = $fields['payment_id'];
- print $paymentfourn_static->getNomUrl(2);
- }
+ // Payment
+ $ratiopaymentinvoice = 1;
+ if ($modetax != 1) {
+ print ' | ';
+ if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+ $paymentfourn_static->id = $fields['payment_id'];
+ print $paymentfourn_static->getNomUrl(2);
+ }
- if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
- print $langs->trans("NA");
- } else {
- if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
- $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
- }
- print price(price2num($fields['payment_amount'], 'MT'));
- if (isset($fields['payment_amount'])) {
- print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
- }
- }
- print ' | ';
- }
+ if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
+ print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+ $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+ }
+ print price(price2num($fields['payment_amount'], 'MT'));
+ if (isset($fields['payment_amount'])) {
+ print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+ }
+ }
+ print '';
+ }
- // VAT paid
- print '';
- $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
- print price(price2num($temp_ht, 'MT'), 1);
- print ' | ';
+ // VAT paid
+ print '';
+ $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+ print price(price2num($temp_ht, 'MT'), 1);
+ print ' | ';
- // VAT
- print '';
- $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
- print price(price2num($temp_vat, 'MT'), 1);
- //print price($fields['vat']);
- print ' | ';
- print '
';
+ // VAT
+ print '';
+ $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+ print price(price2num($temp_vat, 'MT'), 1);
+ //print price($fields['vat']);
+ print ' | ';
+ print '';
- //$subtot_paye_total_ht += $temp_ht;
- //$subtot_paye_vat += $temp_vat;
- //$x_paye_sum += $temp_vat;
- }
- }
- }
+ //$subtot_paye_total_ht += $temp_ht;
+ //$subtot_paye_vat += $temp_vat;
+ //$x_paye_sum += $temp_vat;
+ }
+ }
+ }
- // Total suppliers for this vat rate
- print '';
- print ' | ';
- print ''.$langs->trans("Total").': | ';
- if ($modetax != 1) {
- print ' | ';
- print ' | ';
- }
- print ''.price(price2num($subtot_paye_total_ht, 'MT')).' | ';
- print ''.price(price2num($subtot_paye_vat, 'MT')).' | ';
- print '
';
- }
+ // Total suppliers for this vat rate
+ print '';
+ print ' | ';
+ print ''.$langs->trans("Total").': | ';
+ if ($modetax != 1) {
+ print ' | ';
+ print ' | ';
+ }
+ print ''.price(price2num($subtot_paye_total_ht, 'MT')).' | ';
+ print ''.price(price2num($subtot_paye_vat, 'MT')).' | ';
+ print '
';
+ }
if (count($x_paye) == 0) { // Show a total line if nothing shown
print '';