diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 0540327c40f..a8d86c1a5f9 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -1520,8 +1520,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).''; elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index e83347e876a..cc93cfd61a1 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -588,8 +588,8 @@ if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various') / $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totalbalancefield'] == $i) print ''.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).''; else print ''; diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index 11c14218440..e6358fcb5eb 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -521,8 +521,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 749d112f711..51f3c096f56 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -240,8 +240,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).''; elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 86e963e50df..c77805a4a73 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -294,7 +294,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; - print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; print "".$obj->label."\n"; @@ -303,7 +303,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print ''.$tva_static->getNomUrl(1)."\n"; + print ''.$tva_static->getNomUrl(1)."\n"; // Date print ''.dol_print_date($db->jdate($obj->dm),'day')."\n"; @@ -423,14 +423,14 @@ while($j<$numlt) $total = $total + $obj->amount; print ''; - print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; print "".$obj->label."\n"; // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print ''.$tva_static->getNomUrl(1)."\n"; + print ''.$tva_static->getNomUrl(1)."\n"; print ''.dol_print_date($db->jdate($obj->dp),'day')."\n"; print ''.price($obj->amount).""; @@ -508,14 +508,14 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print ''; - print ''.dol_print_date($db->jdate($obj->dateep),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dateep),'day').''."\n"; print "".$obj->label."\n"; // Ref payment $sal_static->id=$obj->rowid; $sal_static->ref=$obj->rowid; - print ''.$sal_static->getNomUrl(1)."\n"; + print ''.$sal_static->getNomUrl(1)."\n"; // Date print ''.dol_print_date($db->jdate($obj->datep),'day')."\n"; diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 2fa9eecec73..c82219cb7be 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -184,8 +184,8 @@ if ($resql) print $thirdpartystatic->getNomUrl(1,'compta'); print ''; print ''.$obj->town.' '; - print ''.$obj->code_client.' '; - print ''.$obj->code_compta.' '; + print ''.$obj->code_client.' '; + print ''.$obj->code_compta.' '; print ''.dol_print_date($db->jdate($obj->datec)).''; print "\n"; $i++; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 3733247f9e5..c048737b156 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1476,7 +1476,7 @@ else print ''; print " ".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m')); print ''; - print ''; + print ''; print ''; } else diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index c28b0917e1e..be372e8a570 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -688,8 +688,8 @@ if ($resql) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index b730ce98625..7a06e6f66df 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1202,8 +1202,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 907d2357950..07e8678e447 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -575,7 +575,7 @@ if ($object->id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -607,7 +607,7 @@ if ($object->id > 0) $obj = $db->fetch_object($result_sql); print ''; - print '\n"; + print '\n"; print ''; print ''; print ''; @@ -657,7 +657,7 @@ if ($object->id > 0) print ''; - print '\n"; + print '\n"; print ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index cbf147a8dff..0b0520b4737 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -255,7 +255,7 @@ print '
'; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'; // Status - print ''; + print ''; print ''; print ''; } @@ -293,7 +293,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $i++; } - print ''; + print ''; print ''; print ''; } @@ -406,7 +406,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print '
'.$langs->trans("DateRequest").''.$langs->trans("DateRequest").''.$langs->trans("User").''.$langs->trans("Amount").''.$langs->trans("WithdrawalReceipt").'
'.dol_print_date($db->jdate($obj->date_demande),'day')."'.dol_print_date($db->jdate($obj->date_demande),'day')."'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.price($obj->amount).'-
'.dol_print_date($db->jdate($obj->date_demande),'day')."'.dol_print_date($db->jdate($obj->date_demande),'day')."'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; if ($mode == 'customer') { $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled")); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index c6df1479202..e05095b2ea4 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -206,7 +206,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $i++; } - print '
'.$langs->trans("Total").'
'.$langs->trans("Total").''.price($tot_ttc).'
'.$langs->trans("Total").'
'.$langs->trans("Total").''.price($tot_ttc).'
'; print ''; - print ''; + print ''; print $thirdpartystatic->getNomUrl(1,'customer',44); print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; @@ -774,7 +774,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us print ''; - print ''; + print ''; print $societestatic->getNomUrl(1,'customer',44); print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; @@ -898,7 +898,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''; - print '' ; + print '' ; print $societestatic->getNomUrl(1,'customer',44); print ''; print ''.dol_print_date($db->jdate($obj->datelimite),'day').''; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index ff89a95414e..574c7103c61 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -159,8 +159,8 @@ if($calc ==0 || $calc == 2) { print ""; print ""; - print '"; - print '"; + print '"; + print '"; print ""; print ""; print ""; @@ -240,8 +240,8 @@ if($calc ==0 || $calc == 2) if($calc ==0 || $calc == 1){ print "
'.$langs->trans("Num")."'.$langs->trans("Customer")."'.$langs->trans("Num")."'.$langs->trans("Customer")."".$langs->transcountry("ProfId1",$mysoc->country_code)."".$langs->trans("TotalHT")."".$vatcust."
"; print ""; - print '"; - print '"; + print '"; + print '"; print ""; print ""; print ""; diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index 37ead35433c..881420cc89e 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -83,8 +83,8 @@ if ($result) $localtax_static->ref=$obj->rowid; print "\n"; print "\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; $total = $total + $obj->amount; print ""; diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index 9f5d13f98a3..73a9f77341a 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -318,8 +318,8 @@ else //{ // Customers invoices print ''; - print ''; - print ''; + print ''; + print ''; if ($modetax != 2) print ''; if ($modetax != 1) print ''; print ''; @@ -360,7 +360,7 @@ else print ''; // Description - print '
'.$langs->trans("Num")."'.$langs->trans("Supplier")."'.$langs->trans("Num")."'.$langs->trans("Supplier")."".$langs->transcountry("ProfId1",$mysoc->country_code)."".$langs->trans("TotalHT")."".$vatsup."".$localtax_static->getNomUrl(1)."".dol_trunc($obj->label,40)."'.dol_print_date($db->jdate($obj->datev),'day')."'.dol_print_date($db->jdate($obj->datep),'day')."'.dol_print_date($db->jdate($obj->datev),'day')."'.dol_print_date($db->jdate($obj->datep),'day')."".price($obj->amount)."
'.$elementcust.''.$productcust.''.$elementcust.''.$productcust.''.$amountcust.''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'.$langs->trans("BI").''.$fields['link'].''; + print ''; if ($fields['pid']) { $product_static->id=$fields['pid']; @@ -481,8 +481,8 @@ else echo ''; //print table headers for this quadri - expenses now print ''; - print ''; - print ''; + print ''; + print ''; if ($modetax != 1) { print ''; @@ -522,7 +522,7 @@ else print ''; // Description - print '
'.$elementsup.''.$productsup.''.$elementsup.''.$productsup.''.$amountsup.''.$fields['link'].''; + print ''; if ($fields['pid']) { $product_static->id=$fields['pid']; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 38cee6b8434..0b497510bf6 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -264,7 +264,7 @@ if ($action == 'create') print ''; print ''; //print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index be3e7ea5791..261ca57cb94 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -287,8 +287,8 @@ if ($resql) if (isset($totalarray['totalttcfield'])) { print ''; - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index 8dc443aee6b..efdd39d2205 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -259,7 +259,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $total = $total + $obj->amount; print ''; - print ''."\n"; + print ''."\n"; print "\n"; @@ -268,7 +268,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print '\n"; + print '\n"; print '\n"; print '"; @@ -360,7 +360,7 @@ while($j<$numlt) $total = $total + $obj->amount; print ''; - print ''."\n"; + print ''."\n"; print "\n"; @@ -369,7 +369,7 @@ while($j<$numlt) // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print '\n"; + print '\n"; print '\n"; print '"; @@ -442,7 +442,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print ''; - print ''."\n"; + print ''."\n"; print "\n"; @@ -451,7 +451,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) // Ref payment $sal_static->id=$obj->rowid; $sal_static->ref=$obj->rowid; - print '\n"; + print '\n"; print '\n"; print '"; 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("SocialContribution").''.$langs->trans("DateDue").''.$langs->trans("DateDue").''.$langs->trans("Amount").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").'
'.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").'
'.dol_print_date($db->jdate($obj->dm),'day').''.dol_print_date($db->jdate($obj->dm),'day').'".$obj->label."'.$tva_static->getNomUrl(1)."'.$tva_static->getNomUrl(1)."'.dol_print_date($db->jdate($obj->dm),'day')."'.price($obj->amount)."
'.dol_print_date($db->jdate($obj->dm),'day').''.dol_print_date($db->jdate($obj->dm),'day').'".$obj->label."'.$tva_static->getNomUrl(1)."'.$tva_static->getNomUrl(1)."'.dol_print_date($db->jdate($obj->dp),'day')."'.price($obj->amount)."
'.dol_print_date($db->jdate($obj->dateep),'day').''.dol_print_date($db->jdate($obj->dateep),'day').'".$obj->label."'.$sal_static->getNomUrl(1)."'.$sal_static->getNomUrl(1)."'.dol_print_date($db->jdate($obj->datep),'day')."'.price($obj->amount)."
'; 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']; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 15edbc80e2a..99c1c12f781 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -28,6 +28,7 @@ AliasNames=Alias name (commercial, trademark, ...) AliasNameShort=Alias Name Companies=Companies CountryIsInEEC=Country is inside the European Economic Community +PriceFormatInCurrentLanguage=Price format in current language ThirdPartyName=Third-Party Name ThirdPartyEmail=Third-party Email ThirdParty=Third Party