diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 048a4308b36..10b8211a462 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -141,9 +141,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); -/* - * PDF - */ +// Document templates print '
'; print_titre($langs->trans("DonationsModels")); @@ -176,7 +174,7 @@ print ''.$langs->trans("Name").''; print ''.$langs->trans("Description").''; print ''.$langs->trans("Activated").''; print ''.$langs->trans("Default").''; -print ''.$langs->trans("Infos").''; +print ''.$langs->trans("Infos").''; print "\n"; clearstatcache(); @@ -255,11 +253,9 @@ if (is_resource($handle)) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); + $text=''.img_object($langs->trans("Preview"),'generic').''; print ''; - print $html->textwithpicto('',$htmltooltip,1,0); - print ''; - print ''; - print ''.img_object($langs->trans("Preview"),'generic').''; + print $html->textwithpicto('   '.$text,$htmltooltip,-1,0); print ''; print "\n"; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 0cfeb8874f8..105328889bc 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -33,8 +33,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); $langs->load("admin"); $langs->load("errors"); -/*$langs->load("other"); -$langs->load("interventions");*/ +$langs->load("interventions"); if (!$user->admin) accessforbidden(); @@ -42,6 +41,7 @@ accessforbidden(); $action = GETPOST("action"); $value = GETPOST("value"); + /* * Actions */ diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 47406f7f210..2fe9a76b3f7 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2008 Raphael Bertrand (Resultic) + * Copyright (C) 2011 Fabrice CHERRIER (12/05/2011) http://www.fcinc.fr * * 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 @@ -26,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); +require_once(DOL_DOCUMENT_ROOT.'/lib/date.lib.php'); /** @@ -270,25 +272,32 @@ class pdf_soleil extends ModelePDFFicheinter $height_note=0; } - $pdf->SetXY (10, $tab_top); + $pdf->SetXY($this->marge_gauche, $tab_top); $pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0); - $pdf->line(10, $tab_top + 8, 200, $tab_top + 8 ); + $pdf->line($this->marge_gauche, $tab_top + 8, $this->page_largeur-$this->marge_droite, $tab_top + 8 ); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 - $pdf->SetXY (10, $tab_top + 8 ); - $desc=dol_htmlentitiesbr($fichinter->description,1); + $pdf->SetXY($this->marge_gauche, $tab_top + 8 ); + $text=$fichinter->description; + if ($fichinter->duree > 0) + { + $totaltime=ConvertSecondToTime($fichinter->duree,'all',$conf->global->MAIN_DURATION_OF_WORKDAY); + $text.=($text?' - ':'').$langs->trans("Total").": ".$totaltime; + } + $desc=dol_htmlentitiesbr($text,1); //print $outputlangs->convToOutputCharset($desc); exit; + $pdf->writeHTMLCell(180, 3, 10, $tab_top + 8, $outputlangs->convToOutputCharset($desc), 0, 1); $nexY = $pdf->GetY(); - $pdf->line(10, $nexY, 200, $nexY); + $pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY); $pdf->MultiCell(0, 3, ''); // Set interline to 3. Then writeMultiCell must use 3 also. //dol_syslog("desc=".dol_htmlentitiesbr($fichinter->description)); - $nblignes = sizeof($fichinter->lines); + $nblignes = count($fichinter->lines); $curY = $pdf->GetY(); $nexY = $pdf->GetY(); @@ -299,16 +308,16 @@ class pdf_soleil extends ModelePDFFicheinter $fichinterligne = $fichinter->lines[$i]; $valide = $fichinterligne->id ? $fichinterligne->fetch($fichinterligne->id) : 0; - if ($valide>0) + if ($valide>0 || $fichinter->specimen) { $curY = $nexY+3; - $pdf->SetXY (10, $curY); + $pdf->SetXY($this->marge_gauche, $curY); $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $curY, dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($fichinterligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration),1,$outputlangs->charset_output), 0, 1, 0); $nexY = $pdf->GetY(); - $pdf->SetXY (10, $curY + 3); + $pdf->SetXY($this->marge_gauche, $curY + 3); $desc = dol_htmlentitiesbr($fichinterligne->desc,1); $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $curY + 3, $desc, 0, 1, 0); $nexY+=dol_nboflines_bis($fichinterligne->desc,52,$outputlangs->charset_output)*3; @@ -317,8 +326,8 @@ class pdf_soleil extends ModelePDFFicheinter //$pdf->line(10, $tab_top+$tab_height+3, 200, $tab_top+$tab_height+3); // Rectangle for title and all lines - $pdf->Rect(10, $tab_top, 190, $tab_height+3); - $pdf->SetXY (10, $pdf->GetY() + 20); + $pdf->Rect($this->marge_gauche, $tab_top, ($this->page_largeur-$this->marge_gauche-$this->marge_droite), $tab_height+3); + $pdf->SetXY($this->marge_gauche, $pdf->GetY() + 20); $pdf->MultiCell(60, 5, '', 0, 'J', 0); $pdf->SetXY(20,220); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 060fb14090d..475d5430c0a 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -296,8 +296,15 @@ if ($_GET["id"] || $_GET["ref"]) dol_print_error($db); } print ''.$langs->trans("LastMovement").''; - if ($lastmovementdate) print dol_print_date($lastmovementdate,'dayhour').' '; - print '('.$langs->trans("FullList").')'; + if ($lastmovementdate) + { + print dol_print_date($lastmovementdate,'dayhour').' '; + print '('.$langs->trans("FullList").')'; + } + else + { + print ''.$langs->trans("None").''; + } print ""; print "";