mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-14 08:54:21 +01:00
uniformize code
Look: Eldy theme is cleaner
This commit is contained in:
@@ -173,11 +173,11 @@ foreach ($AdherentType as $key => $adhtype)
|
||||
$SommeD+=isset($MembersResiliated[$key])?$MembersResiliated[$key]:0;
|
||||
}
|
||||
print '<tr class="liste_total">';
|
||||
print '<td> <b>'.$langs->trans("Total").'</b> </td>';
|
||||
print '<td align="right"><b>'.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</b></td>';
|
||||
print '<td align="right"><b>'.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</b></td>';
|
||||
print '<td align="right"><b>'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</b></td>';
|
||||
print '<td align="right"><b>'.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->cotisation,0,3).'</b></td>';
|
||||
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
|
||||
print '<td class="liste_total" align="right">'.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
|
||||
print '<td class="liste_total" align="right">'.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
|
||||
print '<td class="liste_total" align="right">'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</td>';
|
||||
print '<td class="liste_total" align="right">'.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->cotisation,0,3).'</td>';
|
||||
print '</tr>';
|
||||
|
||||
print "</table>\n";
|
||||
|
||||
@@ -344,7 +344,7 @@ if ($socid > 0)
|
||||
// Lien recap
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/recap-client.php?socid='.$objsoc->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
print '</table>';
|
||||
@@ -376,7 +376,7 @@ if ($socid > 0)
|
||||
if ($num > 0)
|
||||
{
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$objsoc->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$objsoc->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
$var=!$var;
|
||||
}
|
||||
@@ -429,7 +429,7 @@ if ($socid > 0)
|
||||
if ($num >0 )
|
||||
{
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php?socid='.$objsoc->id.'">'.$langs->trans("AllOrders").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php?socid='.$objsoc->id.'">'.$langs->trans("AllOrders").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
$i = 0;
|
||||
@@ -475,7 +475,7 @@ if ($socid > 0)
|
||||
if ($num >0 )
|
||||
{
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
|
||||
print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/liste.php?socid='.$objsoc->id.'">'.$langs->trans("AllContracts").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
@@ -530,7 +530,7 @@ if ($socid > 0)
|
||||
if ($num >0 )
|
||||
{
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fichinter/index.php?socid='.$objsoc->id.'">'.$langs->trans("AllInterventions").' ('.$num.')</td></tr></table></td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fichinter/index.php?socid='.$objsoc->id.'">'.$langs->trans("AllInterventions").' ('.$num.')</td></tr></table></td>';
|
||||
print '</tr>';
|
||||
$var=!$var;
|
||||
}
|
||||
@@ -572,7 +572,7 @@ if ($socid > 0)
|
||||
$num = $db->num_rows($result);
|
||||
if ($num > 0) {
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="2"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/projet/liste.php?socid='.$objsoc->id.'">'.$langs->trans("AllProjects").' ('.$num.')</td></tr></table></td>';
|
||||
print '<td colspan="2"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/projet/liste.php?socid='.$objsoc->id.'">'.$langs->trans("AllProjects").' ('.$num.')</td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
while ($i < $num && $i < $MAXLIST) {
|
||||
@@ -610,7 +610,7 @@ if ($socid > 0)
|
||||
|
||||
if ($num > 0) {
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="3"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastChronodocs",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/chronodocs/index.php?socid='.$objsoc->id.'">'.$langs->trans("AllChronodocs").' ('.$num.')</td></tr></table></td>';
|
||||
print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastChronodocs",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/chronodocs/index.php?socid='.$objsoc->id.'">'.$langs->trans("AllChronodocs").' ('.$num.')</td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
while ($i < $num && $i < $MAXLIST) {
|
||||
|
||||
@@ -591,7 +591,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
|
||||
$total += $obj->total_ttc;
|
||||
}
|
||||
if ($total>0) {
|
||||
print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td> </td></tr>";
|
||||
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td> </td></tr>";
|
||||
}
|
||||
print "</table><br>";
|
||||
}
|
||||
|
||||
@@ -3701,7 +3701,6 @@ else
|
||||
{
|
||||
$sql .= ' AND (s.nom like \'%'.addslashes($sall).'%\' OR f.facnumber like \'%'.addslashes($sall).'%\' OR f.note like \'%'.addslashes($sall).'%\' OR fd.description like \'%'.addslashes($sall).'%\')';
|
||||
}
|
||||
|
||||
$sql .= ' GROUP BY f.rowid';
|
||||
|
||||
$sql .= ' ORDER BY ';
|
||||
|
||||
@@ -214,7 +214,7 @@ if ($socid > 0)
|
||||
// Lien recap
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$societe->id.'">'.$langs->trans("ShowAccountancyPreview").'</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
print '</table>';
|
||||
@@ -249,7 +249,7 @@ if ($socid > 0)
|
||||
{
|
||||
$tableaushown=1;
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$societe->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$societe->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
||||
@@ -308,7 +308,7 @@ if ($socid > 0)
|
||||
{
|
||||
$tableaushown=1;
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="2"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/projet/index.php?socid='.$societe->id.'">'.$langs->trans("AllProjects").' ('.$num.')</td></tr></table></td>';
|
||||
print '<td colspan="2"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/projet/index.php?socid='.$societe->id.'">'.$langs->trans("AllProjects").' ('.$num.')</td></tr></table></td>';
|
||||
print '</tr>';
|
||||
}
|
||||
while ($i < $num && $i < $MAXLIST)
|
||||
|
||||
@@ -653,7 +653,7 @@ if ($conf->tax->enabled && $user->rights->tax->charges->lire)
|
||||
}
|
||||
|
||||
/*
|
||||
* Commandes clients a facturer
|
||||
* Customers orders to be billed
|
||||
*/
|
||||
if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->commande->lire)
|
||||
{
|
||||
@@ -734,7 +734,7 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
|
||||
$var=!$var;
|
||||
}
|
||||
|
||||
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
|
||||
print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
|
||||
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.price($tot_ht).'</td>';
|
||||
print '<td align="right">'.price($tot_ttc).'</td>';
|
||||
print '<td align="right">'.price($tot_tobill).'</td>';
|
||||
@@ -827,7 +827,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
|
||||
$i++;
|
||||
}
|
||||
|
||||
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).')</font> </td>';
|
||||
print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).')</font> </td>';
|
||||
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.price($total).'</td>';
|
||||
print '<td align="right">'.price($total_ttc).'</td>';
|
||||
print '<td align="right">'.price($totalam).'</td>';
|
||||
@@ -907,7 +907,7 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
|
||||
$var = !$var;
|
||||
}
|
||||
|
||||
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>';
|
||||
print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>';
|
||||
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.price($total).'</td>';
|
||||
print '<td align="right">'.price($total_ttc).'</td>';
|
||||
print '<td align="right">'.price($totalam).'</td>';
|
||||
|
||||
@@ -79,7 +79,7 @@ if ($resql)
|
||||
print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
|
||||
|
||||
print '<form method="get" action="liste.php">';
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<table class="liste" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre($langs->trans("Ref"),"liste.php","bc.number","",$paramlist,"",$sortfield,$sortorder);
|
||||
print_liste_field_titre($langs->trans("DateCreation"),"liste.php","dp","",$paramlist,'align="center"',$sortfield,$sortorder);
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
require("./pre.inc.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
|
||||
|
||||
// Security check
|
||||
if (! $user->rights->facture->lire)
|
||||
|
||||
@@ -121,7 +121,7 @@ if ($result)
|
||||
}
|
||||
}
|
||||
else {
|
||||
dol_print_error($db);
|
||||
dol_print_error($db);
|
||||
}
|
||||
|
||||
// On ajoute les paiements anciennes version, non lies par paiement_facture
|
||||
@@ -155,7 +155,7 @@ if ($modecompta != 'CREANCES-DETTES')
|
||||
}
|
||||
}
|
||||
else {
|
||||
dol_print_error($db);
|
||||
dol_print_error($db);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ $var=true;
|
||||
if (sizeof($amount))
|
||||
{
|
||||
$arrayforsort=$name;
|
||||
|
||||
|
||||
// We define arrayforsort
|
||||
if ($sortfield == 'name' && $sortorder == 'asc') {
|
||||
asort($name);
|
||||
@@ -207,10 +207,10 @@ if (sizeof($amount))
|
||||
print "<td>".$linkname."</td>\n";
|
||||
print '<td align="right">'.price($amount[$key]).'</td>';
|
||||
print '<td align="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal,2).'%' : ' ').'</td>';
|
||||
if ($conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL == 2)
|
||||
if ($conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL == 2)
|
||||
{
|
||||
if($key>0){
|
||||
print '<td align="center"><a href="comm.php?id='.$key.'">'.img_picto($langs->trans("Show"),"vcard").'</a></td>';
|
||||
print '<td align="center"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?id='.$key.'">'.img_picto($langs->trans("Show"),"vcard").'</a></td>';
|
||||
} else {
|
||||
print '<td> </td>' ;
|
||||
}
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
\file htdocs/compta/tva/reglement.php
|
||||
\ingroup tax
|
||||
\brief Liste des r<>glements de TVA effectu<74>s
|
||||
\version $Id$
|
||||
*/
|
||||
* \file htdocs/compta/tva/reglement.php
|
||||
* \ingroup tax
|
||||
* \brief Liste des r<>glements de TVA effectu<74>s
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
|
||||
@@ -86,7 +86,7 @@ if ($result)
|
||||
|
||||
$i++;
|
||||
}
|
||||
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").'</td>';
|
||||
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td>';
|
||||
print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
|
||||
|
||||
print "</table>";
|
||||
|
||||
@@ -62,7 +62,7 @@ if ( $societe->fetch($socid) )
|
||||
*/
|
||||
$head = societe_prepare_head($societe);
|
||||
|
||||
dol_fiche_head($head, 'supplierstat', $langs->trans("ThirdParty"));
|
||||
dol_fiche_head($head, 'supplierstat', $langs->trans("ThirdParty"),0,'company');
|
||||
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
@@ -89,7 +89,7 @@ if ( $societe->fetch($socid) )
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
|
||||
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
|
||||
}
|
||||
|
||||
print '</td><td valign="top" width="50%">';
|
||||
@@ -102,9 +102,9 @@ if ( $societe->fetch($socid) )
|
||||
}
|
||||
else
|
||||
{
|
||||
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
|
||||
print $langs->trans("NoneOrBatchFileNeverRan",'batch_fournisseur_updateturnover.php, batch_fournisseur_buildgraph.php');
|
||||
}
|
||||
|
||||
|
||||
print '</td></tr>';
|
||||
print '</table>' . "\n";
|
||||
print '</div>';
|
||||
|
||||
@@ -61,7 +61,7 @@ if ( $societe->fetch($socid) )
|
||||
*/
|
||||
$head = societe_prepare_head($societe);
|
||||
|
||||
dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"));
|
||||
dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
|
||||
|
||||
|
||||
print '<table width="100%" class="notopnoleftnoright">';
|
||||
@@ -122,7 +122,7 @@ if ( $societe->fetch($socid) )
|
||||
// Lien recap
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
|
||||
print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$societe->id.'">'.$langs->trans("ShowSupplierPreview").'</a></td></tr></table></td>';
|
||||
print '</tr>';
|
||||
print '</table>';
|
||||
@@ -163,7 +163,7 @@ if ( $societe->fetch($socid) )
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="3">';
|
||||
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans("LastOrders",($num<$MAXLIST?$num:$MAXLIST)).'</td>';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastOrders",($num<$MAXLIST?$num:$MAXLIST)).'</td>';
|
||||
print '<td align="right"><a href="commande/liste.php?socid='.$societe->id.'">'.$langs->trans("AllOrders").' ('.$num.')</td></tr></table>';
|
||||
print '</td></tr>';
|
||||
while ($i < $num && $i <= $MAXLIST)
|
||||
@@ -218,7 +218,7 @@ if ( $societe->fetch($socid) )
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td colspan="4">';
|
||||
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="facture/index.php?socid='.$societe->id.'">'.$langs->trans('AllBills').' ('.$num.')</td></tr></table>';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="facture/index.php?socid='.$societe->id.'">'.$langs->trans('AllBills').' ('.$num.')</td></tr></table>';
|
||||
print '</td></tr>';
|
||||
while ($i < min($num,$MAXLIST))
|
||||
{
|
||||
|
||||
@@ -125,8 +125,14 @@ class box_comptes extends ModeleBoxes {
|
||||
$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="right" class="liste_total"',
|
||||
'text' => $langs->trans('Total')
|
||||
);
|
||||
$totalamount=price($solde_total).' '.$langs->trans("Currency".$conf->monnaie);
|
||||
$this->info_box_contents[$i][1] = array('td' => 'align="right" class="liste_total"',
|
||||
'text' => ' '
|
||||
);
|
||||
$this->info_box_contents[$i][2] = array('td' => 'align="right" class="liste_total"',
|
||||
'text' => ' '
|
||||
);
|
||||
$totalamount=price($solde_total).' '.$langs->trans("Currency".$conf->monnaie);
|
||||
$this->info_box_contents[$i][3] = array('td' => 'align="right" class="liste_total"',
|
||||
'text' => $totalamount
|
||||
);
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ class ModeleBoxes
|
||||
$nblines=sizeof($contents);
|
||||
|
||||
print "\n\n<!-- Box start -->\n";
|
||||
print '<div style="padding-right: 2px; padding-left: 2px; padding-bottom: 4px;" id="boxto_'.$this->box_id.'">'."\n";
|
||||
print '<div class="box" id="boxto_'.$this->box_id.'">'."\n";
|
||||
|
||||
if (! empty($head['text']) || ! empty($head['sublink']) || $nblines)
|
||||
{
|
||||
|
||||
@@ -555,7 +555,7 @@ if ($nboflate > 0)
|
||||
{
|
||||
print '<br>';
|
||||
//print '<table width="100%" class="border"><tr><td>';
|
||||
print '<font class="warning">'.img_picto($langs->trans("Alert"),'warning').' '.$langs->trans("WarningYouHaveAtLeastOneTaskLate").'</font>';
|
||||
print '<div class="warning">'.img_picto($langs->trans("Alert"),'warning').' '.$langs->trans("WarningYouHaveAtLeastOneTaskLate").'</div>';
|
||||
//print '</td></tr></table>';
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Impossible sauver une action à l'état
|
||||
ErrorBillRefAlreadyExists=La référence utilisée pour la création existe déjà
|
||||
ErrorPleaseTypeBankTransactionReportName=Veuiller saisir le nom de relevé bancaire sur lequel l'écriture est constaté (Format AAAAMM ou AAAMMJJ)
|
||||
ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il possède des fils.
|
||||
WarningConfFileMustBeReadOnly=Attention, votre fichier de configuration (<b>htdocs/conf/conf.php</b>) est accessible en écriture au serveur Web. Ceci représente une faille sérieuse de sécurité. Modifier les permissions pour qu'il soit en lecture seule pour le compte sous lequel tourne le serveur Web.<br>Si vous êtes sous Windows sur un disque dur utilisant un formatage FAT, sachez que ce système de fichier ne permet pas de protéger des fichiers et n'offre donc aucune solution pour réduire les risques de manipulation de ce fichier.
|
||||
WarningConfFileMustBeReadOnly=Attention, votre fichier de configuration (<b>htdocs/conf/conf.php</b>) est accessible en écriture au serveur Web. Ceci représente une faille sérieuse de sécurité. Modifier les permissions pour qu'il soit en lecture seule pour le compte sous lequel tourne le serveur Web et non lisible pour les autres.<br>Si vous êtes sous Windows sur un disque dur utilisant un formatage FAT, sachez que ce système de fichier ne permet pas de protéger des fichiers et n'offre donc aucune solution pour réduire les risques de manipulation de ce fichier.
|
||||
ErrorModuleRequireJavascript=Le javascript ne doit pas etre désactivé pour que cette fonctionnalité soit utilisable. Pour activer/désactiver l'utilisation de javascript, aller dans le menu Accueil->Configuration->Affichage.
|
||||
ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre
|
||||
ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant <b>%s</b> en lui indiquant le code erreur <b>%s</b> dans votre message ou mieux en fournissant une copie d'écran de cette page.
|
||||
|
||||
@@ -2090,6 +2090,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
|
||||
$nextpage = 0;
|
||||
}
|
||||
|
||||
print "\n";
|
||||
print "<!-- Begin title '".$titre."' -->\n";
|
||||
print '<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;"><tr>';
|
||||
|
||||
$pagelist = '';
|
||||
@@ -2163,7 +2165,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
|
||||
print_fleche_navigation($page,$file,$options,$nextpage,$pagelist);
|
||||
print '</td>';
|
||||
|
||||
print '</tr></table>';
|
||||
print '</tr></table>'."\n";
|
||||
print "<!-- End title -->\n\n";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -828,8 +828,10 @@ border: 0px;
|
||||
/*
|
||||
* Boxes
|
||||
*/
|
||||
table.box {
|
||||
margin: 2px;
|
||||
|
||||
.box {
|
||||
padding-right: 2px;
|
||||
padding-bottom: 2px;
|
||||
}
|
||||
|
||||
tr.box_titre {
|
||||
|
||||
@@ -544,6 +544,12 @@ a.impayee { font-weight: bold }
|
||||
/*
|
||||
* Boxes
|
||||
*/
|
||||
|
||||
.box {
|
||||
padding-right: 6px;
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
||||
tr.box_titre {
|
||||
background: #b3cccc;
|
||||
font-family: Helvetica, Verdana;
|
||||
@@ -580,6 +586,10 @@ div.ok {
|
||||
|
||||
div.warning {
|
||||
color: #997711;
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
border: 1px solid #ebebd4;
|
||||
-moz-border-radius:6px;
|
||||
background: #efefd4;
|
||||
}
|
||||
|
||||
div.error {
|
||||
|
||||
@@ -516,7 +516,6 @@ div.tabs {
|
||||
|
||||
div.tabBar {
|
||||
color: #234046;
|
||||
background: #dee7ec;
|
||||
padding-top: 12px;
|
||||
padding-left: 12px;
|
||||
padding-right: 12px;
|
||||
@@ -530,7 +529,8 @@ div.tabBar {
|
||||
border-bottom: 1px solid #555555;
|
||||
border-left: 1px solid #D0D0D0;
|
||||
border-top: 1px solid #D8D8D8;
|
||||
/* background: #F0F0F0 url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>) repeat-x; */
|
||||
background: #dee7ec;
|
||||
background: #dee7ec url(/theme/eldy/img/tab_background.png) repeat-x;
|
||||
}
|
||||
|
||||
div.tabsAction {
|
||||
@@ -555,7 +555,7 @@ a.tabTitle {
|
||||
}
|
||||
|
||||
a.tab:link {
|
||||
background: white;
|
||||
background: #dee7ec;
|
||||
color: #436976;
|
||||
font-family: helvetica, verdana, arial, sans-serif;
|
||||
padding: 0px 6px;
|
||||
@@ -570,7 +570,7 @@ a.tab:link {
|
||||
border-top: 1px solid #D8D8D8;
|
||||
}
|
||||
a.tab:visited {
|
||||
background: white;
|
||||
background: #dee7ec;
|
||||
color: #436976;
|
||||
font-family: helvetica, verdana, arial, sans-serif;
|
||||
padding: 0px 6px;
|
||||
@@ -585,7 +585,7 @@ a.tab:visited {
|
||||
border-top: 1px solid #D8D8D8;
|
||||
}
|
||||
a.tab#active {
|
||||
background: #dee7ec;
|
||||
background: white;
|
||||
border-bottom: #dee7ec 1px solid;
|
||||
font-family: helvetica, verdana, arial, sans-serif;
|
||||
color: #436976;
|
||||
@@ -598,9 +598,10 @@ a.tab#active {
|
||||
border-<?php print $right; ?>: 1px solid #555555;
|
||||
border-<?php print $left; ?>: 1px solid #D8D8D8;
|
||||
border-top: 1px solid #D8D8D8;
|
||||
border-bottom: 1px solid white;
|
||||
}
|
||||
a.tab:hover {
|
||||
background: #dee7ec;
|
||||
background: white;
|
||||
color: #436976;
|
||||
font-family: helvetica, verdana, arial, sans-serif;
|
||||
padding: 0px 6px;
|
||||
@@ -753,6 +754,7 @@ border-bottom: 1px solid #000000;
|
||||
border-left: 1px solid #000000;
|
||||
}
|
||||
|
||||
/* Main boxes */
|
||||
|
||||
table.noborder {
|
||||
border-collapse: collapse;
|
||||
@@ -765,23 +767,17 @@ border-right-style: solid;
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-color: #BBBBBB;
|
||||
border-bottom-style: solid;
|
||||
|
||||
margin-bottom: 2px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
table.noborder tr {
|
||||
border-top-color: #FEFEFE;
|
||||
|
||||
border-right-width: 1px;
|
||||
border-right-color: #BBBBBB;
|
||||
border-right-style: solid;
|
||||
|
||||
border-left-width: 1px;
|
||||
border-left-color: #BBBBBB;
|
||||
border-left-color: #FEFEFE;
|
||||
border-left-style: solid;
|
||||
/*
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-color: #BBBBBB;
|
||||
border-bottom-style: solid;
|
||||
*/
|
||||
}
|
||||
|
||||
table.noborder td {
|
||||
@@ -802,9 +798,26 @@ border: 0px;
|
||||
padding: 0px 0px;
|
||||
}
|
||||
|
||||
/* For lists */
|
||||
|
||||
table.liste {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border-top-color: #FEFEFE;
|
||||
|
||||
border-right-width: 1px;
|
||||
border-right-color: #BBBBBB;
|
||||
border-right-style: solid;
|
||||
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-color: #BBBBBB;
|
||||
border-bottom-style: solid;
|
||||
|
||||
margin-bottom: 2px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
table.liste td {
|
||||
padding-right: 2px;
|
||||
}
|
||||
|
||||
tr.liste_titre {
|
||||
@@ -846,9 +859,12 @@ border: 0px;
|
||||
}
|
||||
|
||||
tr.liste_total td {
|
||||
border-top: 1px solid #888888;
|
||||
background: #F4F4F4;
|
||||
font-weight: bold;
|
||||
border-top: 1px solid #DDDDDD;
|
||||
background: #F0F0F0;
|
||||
/* background-image: url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>); */
|
||||
background-repeat: repeat-x;
|
||||
color: #332266;
|
||||
font-weight: normal;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@@ -880,7 +896,7 @@ border: 0px;
|
||||
|
||||
.pair {
|
||||
/* background: #e6ebed; */
|
||||
background: #fafafa;
|
||||
background: #f4f4f4;
|
||||
font-family: helvetica, verdana, arial, sans-serif;
|
||||
border: 0px;
|
||||
}
|
||||
@@ -895,8 +911,10 @@ border: 0px;
|
||||
/*
|
||||
* Boxes
|
||||
*/
|
||||
table.box {
|
||||
margin: 2px;
|
||||
|
||||
.box {
|
||||
padding-right: 4px;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
tr.box_titre {
|
||||
@@ -908,8 +926,8 @@ font-family: arial, helvetica, verdana, sans-serif;
|
||||
font-weight: normal;
|
||||
border-bottom: 1px solid #FDFFFF;
|
||||
white-space: nowrap;
|
||||
-moz-border-radius-topleft:4px;
|
||||
-moz-border-radius-topright:4px;
|
||||
-moz-border-radius-topleft:6px;
|
||||
-moz-border-radius-topright:6px;
|
||||
}
|
||||
|
||||
tr.box_impair {
|
||||
@@ -920,7 +938,7 @@ font-family: arial, helvetica, verdana, sans-serif;
|
||||
|
||||
tr.box_pair {
|
||||
/* background: #d0d4d7; */
|
||||
background: #fafafa;
|
||||
background: #f4f4f4;
|
||||
font-family: arial, helvetica, verdana, sans-serif;
|
||||
}
|
||||
|
||||
@@ -948,6 +966,11 @@ div.ok {
|
||||
|
||||
div.warning {
|
||||
color: #997711;
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
margin: 0.5em 0em 0.5em 0em;
|
||||
border: 1px solid #e0e0d0;
|
||||
-moz-border-radius:6px;
|
||||
background: #efefd4;
|
||||
}
|
||||
|
||||
div.error {
|
||||
@@ -955,13 +978,17 @@ div.error {
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
margin: 0.5em 0em 0.5em 0em;
|
||||
border: 1px solid #8C9CAB;
|
||||
-moz-border-radius:6px;
|
||||
}
|
||||
|
||||
div.info { /* Info admin */
|
||||
/* Info admin */
|
||||
div.info {
|
||||
color: #888888;
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
margin: 0.5em 0em 0.5em 0em;
|
||||
border: 1px solid #ACACAB;
|
||||
border: 1px solid #e0e0d0;
|
||||
-moz-border-radius:6px;
|
||||
background: #efefd4;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -684,6 +684,10 @@ div.ok {
|
||||
|
||||
div.warning {
|
||||
color: #777711;
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
border: 1px solid #ebebd4;
|
||||
-moz-border-radius:6px;
|
||||
background: #efefd4;
|
||||
}
|
||||
|
||||
div.error {
|
||||
@@ -801,23 +805,29 @@ th {
|
||||
/*
|
||||
* Boxes
|
||||
*/
|
||||
|
||||
.box {
|
||||
padding-right: 4px;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
tr.box_titre {
|
||||
color: #FFFFFF;
|
||||
background: #777799;
|
||||
font-family: Helvetica, Verdana;
|
||||
color: #FFFFFF;
|
||||
background: #777799;
|
||||
font-family: Helvetica, Verdana;
|
||||
}
|
||||
|
||||
tr.box_pair {
|
||||
background: #dcdcd0;
|
||||
background: #dcdcd0;
|
||||
}
|
||||
|
||||
tr.box_impair {
|
||||
background: #eeeedd;
|
||||
font-family: Helvetica, Verdana;
|
||||
background: #eeeedd;
|
||||
font-family: Helvetica, Verdana;
|
||||
}
|
||||
|
||||
tr.fiche {
|
||||
font-family: Helvetica, Verdana;
|
||||
font-family: Helvetica, Verdana;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -674,6 +674,10 @@ div.ok {
|
||||
|
||||
div.warning {
|
||||
color: #777711;
|
||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||
border: 1px solid #ebebd4;
|
||||
-moz-border-radius:6px;
|
||||
background: #efefd4;
|
||||
}
|
||||
|
||||
div.error {
|
||||
@@ -788,6 +792,12 @@ th {
|
||||
/*
|
||||
* Boxes
|
||||
*/
|
||||
|
||||
.box {
|
||||
padding-right: 4px;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
tr.box_titre {
|
||||
background: #BBBB88;
|
||||
border-top: 1px solid #FFFFFF;
|
||||
@@ -796,16 +806,16 @@ tr.box_titre {
|
||||
}
|
||||
|
||||
tr.box_pair {
|
||||
background: #dcdcb3;
|
||||
background: #dcdcb3;
|
||||
}
|
||||
|
||||
tr.box_impair {
|
||||
background: #eeeecc;
|
||||
font-family: Helvetica, Verdana;
|
||||
background: #eeeecc;
|
||||
font-family: Helvetica, Verdana;
|
||||
}
|
||||
|
||||
tr.fiche {
|
||||
font-family: Helvetica, Verdana;
|
||||
font-family: Helvetica, Verdana;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user