From 3e4982f4eb88a92f5fdb181e84ce407d28082d92 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 18 Jun 2008 20:01:01 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20probl=E8me=20de=20tableau=20avec=20Firef?= =?UTF-8?q?ox=203=20(il=20en=20reste=20encore)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/action/index.php | 31 ++++++++++++++++--------------- htdocs/comm/index.php | 9 +++++---- htdocs/compta/index.php | 6 +++--- htdocs/fourn/index.php | 10 +++++----- htdocs/projet/index.php | 4 ++-- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 04db4f91010..2d28cb80b8b 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2003 Éric Seigne * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2005-2008 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -156,13 +157,13 @@ if ($canedit) print ''; print ''; print ''; - print ''; - print ''; print ''; - print ''; print ''; - print ''; @@ -305,7 +306,7 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++) if($day <= 0) { $style='cal_other_month'; - echo ' \n"; } @@ -321,7 +322,7 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++) else $style='cal_current_month'; - echo ' \n"; } @@ -329,7 +330,7 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++) else { $style='cal_other_month'; - echo ' \n"; } @@ -357,14 +358,14 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray) $curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year); print '
'; + print ''; //print ' '; print $langs->trans("ActionsAskedBy"); - print ''; + print ''; print $form->select_users($filtera,'userasked',1,'',!$canedit); print ''; + print ''; print img_picto($langs->trans("ViewList"),'object_list').' '; print '
'; print '
'; @@ -171,18 +172,18 @@ if ($canedit) print '
'; + print ''; //print ' '; print $langs->trans("ActionsToDoBy"); - print ''; + print ''; print $form->select_users($filtert,'usertodo',1,'',!$canedit); print '
'; + print ''; //print ' '; print $langs->trans("ActionsDoneBy"); - print ''; + print ''; print $form->select_users($filterd,'userdone',1,'',!$canedit); print '
'; + echo ' '; show_day_events ($db, $max_day_in_prev_month + $day, $prev_month, $prev_year, $style, $actionarray); echo " '; + echo ' '; show_day_events ($db, $day, $month, $year, $style, $actionarray); echo " '; + echo ' '; show_day_events ($db, $day - $max_day_in_month, $next_month, $next_year, $style, $actionarray); echo "
'; - print ''; - print ''; - print ''; + print ''; + print ''; print ''; $i++; $total += $obj->price; @@ -213,8 +214,8 @@ if ($conf->commande->enabled && $user->rights->commande->lire) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; - print ''; + print ''; + print ''; print ''; $i++; $total += $obj->total_ttc; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index d33036a8de5..1944c84c814 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2007 Laurent Destailleur - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2008 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -163,13 +163,13 @@ if ($conf->facture->enabled && $user->rights->facture->lire) while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); - print ''; - print ''; - print ''; - print '"; - print ''; + print ''; print ''; print "\n"; @@ -137,7 +137,7 @@ if ( $resql ) $row = $db->fetch_row( $resql); $var=!$var; print ""; - print ''; + print ''; print ''; print "\n";
'; + print '
'; print dolibarr_print_date($curtime,'%a %d'); - print ''; + print ''; print ''; print img_picto($langs->trans("NewAction"),'edit_add.png'); print ''; print '
'; // Minimum 60px height + print '
'; // Minimum 60px height //$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year); $i=0; @@ -384,7 +385,7 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray) $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); //print "x".$color; print ''; - print ''; - print '
'; + print ''; $tmpyearstart = date('Y',$action->date_start_in_calendar); $tmpmonthstart = date('m',$action->date_start_in_calendar); $tmpdaystart = date('d',$action->date_start_in_calendar); @@ -419,7 +420,7 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray) print '
'; print $action->getNomUrl(0,14,'cal_event'); print '		'.$action->getLibStatut(3); + print ''.$action->getLibStatut(3); print '
'; $i++; } diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 047d0fc714c..9c4bf651a4e 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -1,6 +1,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2005-2008 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -161,8 +162,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $obj = $db->fetch_object($resql); $var=!$var; - print '
'."rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.''.dolibarr_trunc($obj->nom,18).'
'."rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.''.dolibarr_trunc($obj->nom,18).''.price($obj->total_ht).'
rowid\">".img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref."'.dolibarr_trunc($obj->nom,18).'
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''.dolibarr_trunc($obj->nom,18).''.price($obj->total_ttc).'
'; + print '
'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print ''; + print ''; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=1; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index eee7c2686bd..aa9c14c375e 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2007 Laurent Destailleur - * Copyright (C) 2005-2007 Regis Houssin + * Copyright (C) 2005-2008 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -158,12 +158,12 @@ if ($conf->fournisseur->enabled) { $var=!$var; $obj = $db->fetch_object($resql); - print "
"; + print '
'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print $commandestatic->getNomUrl(1,'',16); print ''; + print ''; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=0; @@ -215,13 +215,13 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) { $obj = $db->fetch_object($resql); $var=!$var; - print '
'; + print '
'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print ''; + print ''; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=0; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 35dbbd2e8de..f0b15ea83eb 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -84,7 +84,7 @@ if ( $resql ) $row = $db->fetch_row( $resql); $var=!$var; print "
'.img_object($langs->trans("ShowProject"),"project")." ".$row[0].''.img_object($langs->trans("ShowProject"),"project")." ".$row[0].''.$row[2].'
'.img_object($langs->trans("ShowCompany"),"company")." ".$row[0].''.img_object($langs->trans("ShowCompany"),"company")." ".$row[0].''.$row[2].'