diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 41b3e12a196..e0b60a87753 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -193,7 +193,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) if ($total>0) { - print ''.$langs->trans("Total").''.price($total).""; + print ''.$langs->trans("Total").''.price($total).""; } } else @@ -272,7 +272,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos } if ($total>0) { - print ''.$langs->trans("Total").''.price($total).""; + print ''.$langs->trans("Total").''.price($total).""; } } else @@ -348,7 +348,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) print ''.price($obj->total_ht).''; } else { - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; } $i++; $total += $obj->total_ttc; @@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) if ($total>0) { - print ''.$langs->trans("Total").''.price($total).""; + print ''.$langs->trans("Total").''.price($total).""; } } else @@ -435,7 +435,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande print ''.price($obj->total_ht).''; } else { - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; } $i++; $total += $obj->total_ttc; @@ -443,7 +443,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande if ($total>0) { - print ''.$langs->trans("Total").''.price($total).""; + print ''.$langs->trans("Total").''.price($total).""; } } else @@ -499,7 +499,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire) else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max); else print $langs->trans("BoxTitleLastModifiedCustomers",$max); print ''; - print ''.$langs->trans("FullList").''; + print ''.$langs->trans("FullList").''; print ''; if ($num) { @@ -514,10 +514,10 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire) $companystatic->canvas=$objp->canvas; print ''; print ''.$companystatic->getNomUrl(1,'customer',48).''; - print ''; + print ''; print $companystatic->getLibCustProspStatut(); print ""; - print ''.dol_print_date($db->jdate($objp->tms),'day').""; + print ''.dol_print_date($db->jdate($objp->tms),'day').""; print ''; $i++; } @@ -559,7 +559,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire) print ''; print ''; print ''; - print ''; + print ''; print ''; if ($num) { @@ -573,7 +573,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire) $companystatic->canvas=$objp->canvas; print ''; print ''; - print ''; + print ''; print ''; $i++; @@ -655,7 +655,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO $companystatic->canvas=$objp->canvas; print $companystatic->getNomUrl(1,'customer',44); print ''."\n"; - print "\n"; + print "\n"; $i++; } @@ -742,13 +742,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1, 'customer', 44); print ''; - print ''."\n"; if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { - print ''; + print ''; } else { - print ''; + print ''; } print ''."\n"; print ''."\n"; @@ -761,7 +761,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) } else if ($total>0) { - print '"; + print '"; } print "
'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).''.$langs->trans("FullList").''.$langs->trans("FullList").'
'.$companystatic->getNomUrl(1,'supplier',44).''.dol_print_date($db->jdate($objp->dm),'day').''.dol_print_date($db->jdate($objp->dm),'day').'
".$staticcontrat->LibStatut($obj->statut,3)."
".$staticcontrat->LibStatut($obj->statut,3)."
'; + print ''; print dol_print_date($db->jdate($obj->dp),'day').''.price($obj->total_ht).''.price($obj->total_ht).''.price($obj->total_ttc).''.price($obj->total_ttc).''.$propalstatic->LibStatut($obj->fk_statut,3).'
'.$langs->trans("Total")."".price($total)." 
'.$langs->trans("Total")."".price($total)." 
"; print "
"; @@ -846,13 +846,13 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1, 'customer', 44); print ''; - print ''; + print ''; print dol_print_date($db->jdate($obj->dp),'day').''."\n"; if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; } else { - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; } print ''.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).''."\n"; print ''."\n"; @@ -865,7 +865,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) } else if ($total>0) { - print ''.$langs->trans("Total")."".price($total)." "; + print ''.$langs->trans("Total")."".price($total)." "; } print ""; print "
"; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 7bbf727a517..aed6e0c53cb 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -149,7 +149,7 @@ if ($_socid > 0) print ''; print ''.$langs->trans("Date").''; print ''.$langs->trans("PriceLevel").''; - print ''.$langs->trans("User").''; + print ''.$langs->trans("User").''; print ''; $i = 0 ; $num = $db->num_rows($resql); @@ -163,7 +163,7 @@ if ($_socid > 0) print ''.$obj->price_level.' '; $userstatic->id=$obj->uid; $userstatic->lastname=$obj->login; - print ''.$userstatic->getNomUrl(1).''; + print ''.$userstatic->getNomUrl(1).''; print ''; $i++; } diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index fe002f81a97..1d3aa865460 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -434,9 +434,9 @@ if ($socid > 0) print ''.$langs->trans("Date").''; // Need 120+ for format with AM/PM print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; - print ''.$langs->trans("AmountHT").''; - print ''.$langs->trans("VATRate").''; - print ''.$langs->trans("AmountTTC").''; + print ''.$langs->trans("AmountHT").''; + print ''.$langs->trans("VATRate").''; + print ''.$langs->trans("AmountTTC").''; print ''.$langs->trans("DiscountOfferedBy").''; print ' '; print ''; @@ -487,9 +487,9 @@ if ($socid > 0) print ''; } print ''.$langs->trans("NotConsumed").''; - print ''.price($obj->amount_ht).''; - print ''.price2num($obj->tva_tx,'MU').'%'; - print ''.price($obj->amount_ttc).''; + print ''.price($obj->amount_ht).''; + print ''.price2num($obj->tva_tx,'MU').'%'; + print ''.price($obj->amount_ttc).''; print ''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ''; @@ -573,9 +573,9 @@ if ($socid > 0) print ''.$langs->trans("Date").''; // Need 120+ for format with AM/PM print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; - print ''.$langs->trans("AmountHT").''; - print ''.$langs->trans("VATRate").''; - print ''.$langs->trans("AmountTTC").''; + print ''.$langs->trans("AmountHT").''; + print ''.$langs->trans("VATRate").''; + print ''.$langs->trans("AmountTTC").''; print ''.$langs->trans("DiscountOfferedBy").''; print ' '; print ''; @@ -626,9 +626,9 @@ if ($socid > 0) print ''; } print ''.$langs->trans("NotConsumed").''; - print ''.price($obj->amount_ht).''; - print ''.price2num($obj->tva_tx,'MU').'%'; - print ''.price($obj->amount_ttc).''; + print ''.price($obj->amount_ht).''; + print ''.price2num($obj->tva_tx,'MU').'%'; + print ''.price($obj->amount_ttc).''; print ''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ''; @@ -746,9 +746,9 @@ if ($socid > 0) print ''.$langs->trans("Date").''; // Need 120+ for format with AM/PM print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; - print ''.$langs->trans("AmountHT").''; - print ''.$langs->trans("VATRate").''; - print ''.$langs->trans("AmountTTC").''; + print ''.$langs->trans("AmountHT").''; + print ''.$langs->trans("VATRate").''; + print ''.$langs->trans("AmountTTC").''; print ''.$langs->trans("Author").''; print ' '; print ''; @@ -820,9 +820,9 @@ if ($socid > 0) print ''; } print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.''; - print ''.price($obj->amount_ht).''; - print ''.price2num($obj->tva_tx,'MU').'%'; - print ''.price($obj->amount_ttc).''; + print ''.price($obj->amount_ht).''; + print ''.price2num($obj->tva_tx,'MU').'%'; + print ''.price($obj->amount_ttc).''; print ''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ''; @@ -900,9 +900,9 @@ if ($socid > 0) print ''.$langs->trans("Date").''; // Need 120+ for format with AM/PM print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; - print ''.$langs->trans("AmountHT").''; - print ''.$langs->trans("VATRate").''; - print ''.$langs->trans("AmountTTC").''; + print ''.$langs->trans("AmountHT").''; + print ''.$langs->trans("VATRate").''; + print ''.$langs->trans("AmountTTC").''; print ''.$langs->trans("Author").''; print ' '; print ''; @@ -974,9 +974,9 @@ if ($socid > 0) print ''; } print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.''; - print ''.price($obj->amount_ht).''; - print ''.price2num($obj->tva_tx,'MU').'%'; - print ''.price($obj->amount_ttc).''; + print ''.price($obj->amount_ht).''; + print ''.price2num($obj->tva_tx,'MU').'%'; + print ''.price($obj->amount_ttc).''; print ''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; print ''; diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index ff9cb2c37fb..575c7985e3a 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -175,7 +175,7 @@ if ($resql) print ''.$obj->town.' '; print ''.$obj->code_client.' '; print ''.$obj->code_compta.' '; - print ''.dol_print_date($db->jdate($obj->datec)).''; + print ''.dol_print_date($db->jdate($obj->datec)).''; print "\n"; $i++; } diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index a87c4d868bf..5c88a0597d0 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -145,7 +145,7 @@ if ($resql) { print ''; print ''.$commandestatic->LibStatut($status,$bool,0).''; - print ''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; + print ''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; print $commandestatic->LibStatut($status,$bool,3); print ''; print ''; @@ -153,7 +153,7 @@ if ($resql) } } //if ($totalinprocess != $total) - print ''.$langs->trans("Total").''.$total.''; + print ''.$langs->trans("Total").''.$total.''; print "
"; } else @@ -289,7 +289,7 @@ if ($resql) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -302,7 +302,7 @@ if ($resql) print $companystatic->getNomUrl(1,'company',16); print ''; print ''.dol_print_date($db->jdate($obj->datem),'day').''; - print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; + print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; } @@ -369,7 +369,7 @@ if (! empty($conf->commande->enabled)) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -382,7 +382,7 @@ if (! empty($conf->commande->enabled)) print $companystatic->getNomUrl(1,'company',24); print ''; - print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; + print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; @@ -451,7 +451,7 @@ if (! empty($conf->commande->enabled)) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -464,7 +464,7 @@ if (! empty($conf->commande->enabled)) print $companystatic->getNomUrl(1,'company'); print ''; - print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; + print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 739e3699133..178f68ddd05 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1025,7 +1025,7 @@ if ($resql) // Amount HT if (! empty($arrayfields['c.total_ht']['checked'])) { - print ''.price($obj->total_ht)."\n"; + print ''.price($obj->total_ht)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield']; $totalarray['totalht'] += $obj->total_ht; @@ -1033,7 +1033,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['c.total_vat']['checked'])) { - print ''.price($obj->total_tva)."\n"; + print ''.price($obj->total_tva)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield']; $totalarray['totalvat'] += $obj->total_tva; @@ -1041,7 +1041,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['c.total_ttc']['checked'])) { - print ''.price($obj->total_ttc)."\n"; + print ''.price($obj->total_ttc)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield']; $totalarray['totalttc'] += $obj->total_ttc; @@ -1072,7 +1072,7 @@ if ($resql) // Status if (! empty($arrayfields['c.fk_statut']['checked'])) { - print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).''; + print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).''; if (! $i) $totalarray['nbfield']++; } // Billed @@ -1118,9 +1118,9 @@ if ($resql) 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']).''; - elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; + elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; + elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; + elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; else print ''; } print ''; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 6fc778fb064..a57430f7ee8 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -306,12 +306,12 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -324,24 +324,24 @@ foreach ($data as $val) print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; } diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 392d2455e2a..840ba06980a 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -81,9 +81,9 @@ if (count($linkedObjectBlock) > 1) - - - + + + "; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { - print ''; + print ''; } print "\n"; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index a8d86c1a5f9..a3928cbc0ca 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -704,8 +704,8 @@ if ($resql) $form->select_comptes(GETPOST('add_account','int')?GETPOST('add_account','int'):$search_account,'add_account',0,'',1, ($id > 0 || ! empty($ref)?' disabled="disabled"':'')); print ''; //} - print ''; - print ''; + print ''; + print ''; /*if (! empty($conf->accounting->enabled)) { print ''; } if (! empty($arrayfields['b.debit']['checked'])) { - print ''; } if (! empty($arrayfields['b.credit']['checked'])) { - print ''; } if (! empty($arrayfields['balancebefore']['checked'])) { - print ''; } if (! empty($arrayfields['balance']['checked'])) { - print ''; @@ -1072,13 +1072,13 @@ if ($resql) if (! empty($arrayfields['balancebefore']['checked'])) { - print ''; } if (! empty($arrayfields['balance']['checked'])) { - print ''; } @@ -1126,7 +1126,7 @@ if ($resql) // Ref if (! empty($arrayfields['b.rowid']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -1346,7 +1346,7 @@ if ($resql) // Bank account if (! empty($arrayfields['ba.ref']['checked'])) { - print '\n"; if (! $i) $totalarray['nbfield']++; @@ -1369,7 +1369,7 @@ if ($resql) // Credit if (! empty($arrayfields['b.credit']['checked'])) { - print ''; + print ''; } else { - print ''; + print ''; } } else @@ -1407,7 +1407,7 @@ if ($resql) { if ($balance >= 0) { - print ''; + print ''; } else { @@ -1523,8 +1523,8 @@ if ($resql) if ($num < $limit && empty($offset)) print ''; else print ''; } - elseif ($totalarray['totaldebfield'] == $i) print ''; - elseif ($totalarray['totalcredfield'] == $i) print ''; + elseif ($totalarray['totaldebfield'] == $i) print ''; + elseif ($totalarray['totalcredfield'] == $i) print ''; elseif ($i == $posconciliatecol) { print '
'.$langs->trans("Year").''.$langs->trans("NbOfOrders").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%'.$langs->trans("NbOfOrders").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%
0?'&userid='.$userid:'').'">'.$oldyear.'000000
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).'
'.$langs->trans("Total")."'.price($totsorties[$annee]).''.price($totentrees[$annee]).''.price($totsorties[$annee]).''.price($totentrees[$annee]).'
'; @@ -896,32 +896,32 @@ if ($resql) } if (! empty($arrayfields['ba.ref']['checked'])) { - print ''; + print ''; $form->select_comptes($search_account,'search_account',0,'',1, ($id > 0 || ! empty($ref)?' disabled="disabled"':'')); print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); print $form->textwithpicto('', $htmltext, 1); print ''; + print ''; $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); print $form->textwithpicto('', $htmltext, 1); print ''; + print ''; print price(price2num($balance, 'MT'), 1, $langs); print ''; + print ''; print price(price2num($balance, 'MT'), 1, $langs); print ''; + print ''; print "rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid."   "; print ''; + print ''; print $bankaccount->getNomUrl(1); print "'; + print ''; if ($objp->amount > 0) { print price($objp->amount); @@ -1387,11 +1387,11 @@ if ($resql) { if ($balancebefore >= 0) { - print ' '.price($balancebefore).' '.price($balancebefore).' '.price($balancebefore).' '.price($balancebefore).' '.price($balance).' '.price($balance).''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price(-1 * $totalarray['totaldeb']).''.price($totalarray['totalcred']).''.price(-1 * $totalarray['totaldeb']).''.price($totalarray['totalcred']).'';