From 566d0c7daf818bdd85b3a77e3caf0762c9bca630 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Feb 2009 21:00:47 +0000 Subject: [PATCH] Trad --- htdocs/compta/tva/quadri_detail.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 94e94222397..8df1928c2a4 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -98,7 +98,7 @@ if ($modetax==1) // Caluclate on invoice for goods and services $description.=$fsearch; $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); - + $elementcust=$langs->trans("CustomersInvoices"); $productcust=$langs->trans("ProductOrService"); $amountcust=$langs->trans("AmountHT"); @@ -203,8 +203,8 @@ else $x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht']; $x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat']; if(!isset($x_both[$my_paye_rate]['coll']['totalht'])){ - $x_both[$my_paye_rate]['coll']['totalht'] = 0; - $x_both[$my_paye_rate]['coll']['vat'] = 0; + $x_both[$my_paye_rate]['coll']['totalht'] = 0; + $x_both[$my_paye_rate]['coll']['vat'] = 0; } $x_both[$my_paye_rate]['paye']['links'] = ''; $x_both[$my_paye_rate]['paye']['detail'] = array(); @@ -248,7 +248,7 @@ else print ''; print ''.$elementcust.''; print ''.$productcust.''; - if ($modetax == 0) + if ($modetax == 0) { print ''.$amountcust.''; print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; @@ -309,7 +309,7 @@ else { if ($fields['payment_amount'] && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); print ''; - if ($fields['payment_amount'] && $fields['ftotal_ttc']) + if ($fields['payment_amount'] && $fields['ftotal_ttc']) { $payment_static->rowid=$fields['payment_id']; print $payment_static->getNomUrl(2); @@ -330,7 +330,7 @@ else //print price($fields['vat']); print ''; print ''; - + $subtot_coll_total_ht += $temp_ht; $subtot_coll_vat += $temp_vat; $x_coll_sum += $temp_vat; @@ -357,10 +357,10 @@ else print ''; print ''.$elementsup.''; print ''.$productsup.''; - if ($modetax == 0) + if ($modetax == 0) { print ''.$amountsup.''; - print ''.$langs->trans("Payment").' (% of invoice)'; + print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; } print ''.$langs->trans("AmountHTVATRealPayed").''; print ''.$vatsup.''; @@ -416,7 +416,7 @@ else { if ($fields['payment_amount'] && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); print ''; - if ($fields['payment_amount'] && $fields['ftotal_ttc']) + if ($fields['payment_amount'] && $fields['ftotal_ttc']) { $paymentfourn_static->rowid=$fields['payment_id']; print $paymentfourn_static->getNomUrl(2); @@ -437,13 +437,13 @@ else //print price($fields['vat']); print ''; print ''; - + $subtot_paye_total_ht += $temp_ht; $subtot_paye_vat += $temp_vat; $x_paye_sum += $temp_vat; } } - + print ''; print ' '; print ''.$langs->trans("Total").':'; @@ -455,7 +455,7 @@ else print ''.price(price2num($subtot_paye_total_ht,'MT')).''; print ''.price(price2num($subtot_paye_vat,'MT')).''; print ''; - } + } print ' ';