forked from Wavyzz/dolibarr
Several enhancement for 6.0
This commit is contained in:
@@ -1271,7 +1271,7 @@ else
|
|||||||
|
|
||||||
$hselected = 0;
|
$hselected = 0;
|
||||||
|
|
||||||
dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
|
dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -1595,7 +1595,7 @@ else
|
|||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
// Dates de en service prevues et effectives
|
// Dates of service planed and real
|
||||||
if ($objp->subprice >= 0)
|
if ($objp->subprice >= 0)
|
||||||
{
|
{
|
||||||
$colspan = 6;
|
$colspan = 6;
|
||||||
@@ -1862,15 +1862,13 @@ else
|
|||||||
print '</table>';
|
print '</table>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Form to activate line
|
||||||
if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
|
if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* Activer la ligne de contrat
|
|
||||||
*/
|
|
||||||
print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&ligne='.GETPOST('ligne').'&action=active" method="post">';
|
print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&ligne='.GETPOST('ligne').'&action=active" method="post">';
|
||||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
|
|
||||||
print '<table class="noborder tableforservicepart2" width="100%">';
|
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
|
||||||
|
|
||||||
// Definie date debut et fin par defaut
|
// Definie date debut et fin par defaut
|
||||||
$dateactstart = $objp->date_debut;
|
$dateactstart = $objp->date_debut;
|
||||||
|
|||||||
@@ -1765,7 +1765,7 @@ class Contrat extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Return label of a contract status
|
* Return label of a contract status
|
||||||
*
|
*
|
||||||
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services
|
* @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
|
||||||
* @return string Label
|
* @return string Label
|
||||||
*/
|
*/
|
||||||
function getLibStatut($mode)
|
function getLibStatut($mode)
|
||||||
@@ -1777,7 +1777,7 @@ class Contrat extends CommonObject
|
|||||||
* Renvoi label of a given contrat status
|
* Renvoi label of a given contrat status
|
||||||
*
|
*
|
||||||
* @param int $statut Status id
|
* @param int $statut Status id
|
||||||
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services
|
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
|
||||||
* @return string Label
|
* @return string Label
|
||||||
*/
|
*/
|
||||||
function LibStatut($statut,$mode)
|
function LibStatut($statut,$mode)
|
||||||
@@ -1808,7 +1808,7 @@ class Contrat extends CommonObject
|
|||||||
if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
|
if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
|
||||||
if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
|
if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
|
||||||
}
|
}
|
||||||
if ($mode == 4 || $mode == 6)
|
if ($mode == 4 || $mode == 6 || $mode == 7)
|
||||||
{
|
{
|
||||||
$line=new ContratLigne($this->db);
|
$line=new ContratLigne($this->db);
|
||||||
$text='';
|
$text='';
|
||||||
@@ -1818,10 +1818,15 @@ class Contrat extends CommonObject
|
|||||||
$text.=' '.$langs->trans("Services");
|
$text.=' '.$langs->trans("Services");
|
||||||
$text.=': ';
|
$text.=': ';
|
||||||
}
|
}
|
||||||
$text.=$this->nbofserviceswait.' '.$line->LibStatut(0,3).' ';
|
$text.=($mode == 7?'<div class="inline-block">':'');
|
||||||
$text.=$this->nbofservicesopened.' '.$line->LibStatut(4,3,0).' ';
|
$text.=($mode != 7 || $this->nbofserviceswait > 0) ? $this->nbofserviceswait.' '.$line->LibStatut(0,3).' ' : '';
|
||||||
$text.=$this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).' ';
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
$text.=$this->nbofservicesclosed.' '.$line->LibStatut(5,3);
|
$text.=($mode != 7 || $this->nbofservicesopened > 0) ? $this->nbofservicesopened.' '.$line->LibStatut(4,3,0).' ' : '';
|
||||||
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
|
$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? $this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).' ' : '';
|
||||||
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
|
$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? $this->nbofservicesclosed.' '.$line->LibStatut(5,3).' ' : '';
|
||||||
|
$text.=($mode == 7?'</div>':'');
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
if ($mode == 5)
|
if ($mode == 5)
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
|
|||||||
<td></td>
|
<td></td>
|
||||||
<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
|
<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
|
||||||
<td align="right"> </td>
|
<td align="right"> </td>
|
||||||
<td align="right"><?php echo $objectlink->getLibStatut(6); ?></td>
|
<td align="right"><?php echo $objectlink->getLibStatut(7); ?></td>
|
||||||
<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
|
<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
|
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
|
||||||
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
|
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
|
||||||
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2016-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -125,7 +125,7 @@ class box_contracts extends ModeleBoxes
|
|||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'class="nowrap right"',
|
'td' => 'class="nowrap right"',
|
||||||
'text' => $contractstatic->getLibStatut(6),
|
'text' => $contractstatic->getLibStatut(7),
|
||||||
'asis'=>1,
|
'asis'=>1,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -325,13 +325,13 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
|
|||||||
if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
|
if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
|
||||||
|
|
||||||
if ($maxlength) $textwithnotags=dol_trunc($textwithnotags,$maxlength);
|
if ($maxlength) $textwithnotags=dol_trunc($textwithnotags,$maxlength);
|
||||||
if (preg_match('/^<img/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text; // show text with no html cleaning
|
if (preg_match('/^<img/i',$text) || preg_match('/^<div/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text; // show text with no html cleaning
|
||||||
else $out.= $textwithnotags; // show text with html cleaning
|
else $out.= $textwithnotags; // show text with html cleaning
|
||||||
|
|
||||||
// End Url
|
// End Url
|
||||||
if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
|
if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
|
||||||
|
|
||||||
if (preg_match('/^<img/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
|
if (preg_match('/^<img/i',$text2) || preg_match('/^<div/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
|
||||||
else $out.= $text2withnotags; // show text with html cleaning
|
else $out.= $text2withnotags; // show text with html cleaning
|
||||||
|
|
||||||
if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";
|
if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";
|
||||||
|
|||||||
@@ -55,14 +55,6 @@ function fichinter_prepare_head($object)
|
|||||||
$h++;
|
$h++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/fichinter/apercu.php?id='.$object->id;
|
|
||||||
$head[$h][1] = $langs->trans('Preview');
|
|
||||||
$head[$h][2] = 'preview';
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show more tabs from modules
|
// Show more tabs from modules
|
||||||
// Entries must be declared in modules descriptor with line
|
// Entries must be declared in modules descriptor with line
|
||||||
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
|
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
|
||||||
|
|||||||
@@ -1626,7 +1626,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
|
|||||||
$original_file=$conf->commande->dir_output.'/'.$original_file;
|
$original_file=$conf->commande->dir_output.'/'.$original_file;
|
||||||
}
|
}
|
||||||
// Wrapping pour les apercu intervention
|
// Wrapping pour les apercu intervention
|
||||||
elseif ($modulepart == 'apercufichinter' && !empty($conf->ficheinter->dir_output))
|
elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
|
||||||
{
|
{
|
||||||
if ($fuser->rights->ficheinter->lire) $accessallowed=1;
|
if ($fuser->rights->ficheinter->lire) $accessallowed=1;
|
||||||
$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
|
$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
|
||||||
|
|||||||
@@ -1014,6 +1014,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
|
|||||||
if ($object->element == 'propal') $modulepart='propal';
|
if ($object->element == 'propal') $modulepart='propal';
|
||||||
if ($object->element == 'commande') $modulepart='commande';
|
if ($object->element == 'commande') $modulepart='commande';
|
||||||
if ($object->element == 'facture') $modulepart='facture';
|
if ($object->element == 'facture') $modulepart='facture';
|
||||||
|
if ($object->element == 'fichinter') $modulepart='ficheinter';
|
||||||
|
|
||||||
if ($object->element == 'product')
|
if ($object->element == 'product')
|
||||||
{
|
{
|
||||||
@@ -1041,7 +1042,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
|
|||||||
if ($modulepart != 'unknown')
|
if ($modulepart != 'unknown')
|
||||||
{
|
{
|
||||||
// Check if a preview file is available
|
// Check if a preview file is available
|
||||||
if (in_array($modulepart, array('propal', 'commande', 'facture')) && class_exists("Imagick"))
|
if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter')) && class_exists("Imagick"))
|
||||||
{
|
{
|
||||||
$objectref = dol_sanitizeFileName($object->ref);
|
$objectref = dol_sanitizeFileName($object->ref);
|
||||||
$dir_output = $conf->$modulepart->dir_output . "/";
|
$dir_output = $conf->$modulepart->dir_output . "/";
|
||||||
@@ -2694,6 +2695,7 @@ function img_warning($titlealt = 'default', $morealt = '')
|
|||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
|
||||||
|
|
||||||
|
//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): '')).'</div>';
|
||||||
return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
|
return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,197 +0,0 @@
|
|||||||
<?php
|
|
||||||
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
|
||||||
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
|
||||||
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
|
|
||||||
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* the Free Software Foundation; either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* \file htdocs/fichinter/apercu.php
|
|
||||||
* \ingroup fichinter
|
|
||||||
* \brief Page de l'onglet apercu d'une fiche d'intervention
|
|
||||||
*/
|
|
||||||
|
|
||||||
require '../main.inc.php';
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
|
|
||||||
if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
|
||||||
|
|
||||||
$langs->load('interventions');
|
|
||||||
|
|
||||||
|
|
||||||
// Security check
|
|
||||||
$socid=0;
|
|
||||||
$id = GETPOST('id','int');
|
|
||||||
$ref = GETPOST('ref','alpha');
|
|
||||||
if ($user->societe_id) $socid=$user->societe_id;
|
|
||||||
$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* View
|
|
||||||
*/
|
|
||||||
|
|
||||||
llxHeader();
|
|
||||||
|
|
||||||
$form = new Form($db);
|
|
||||||
|
|
||||||
/* *************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* Mode fiche */
|
|
||||||
/* */
|
|
||||||
/* *************************************************************************** */
|
|
||||||
|
|
||||||
if ($id > 0 || ! empty($ref))
|
|
||||||
{
|
|
||||||
$object = new Fichinter($db);
|
|
||||||
|
|
||||||
if ($object->fetch($id,$ref) > 0)
|
|
||||||
{
|
|
||||||
$soc = new Societe($db);
|
|
||||||
$soc->fetch($object->socid);
|
|
||||||
|
|
||||||
$head = fichinter_prepare_head($object);
|
|
||||||
dol_fiche_head($head, 'preview', $langs->trans("InterventionCard"), 0, 'intervention');
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Fiche intervention
|
|
||||||
*/
|
|
||||||
print '<table class="border" width="100%">';
|
|
||||||
|
|
||||||
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
|
||||||
|
|
||||||
// Ref
|
|
||||||
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
|
||||||
print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
|
|
||||||
print '</td></tr>';
|
|
||||||
|
|
||||||
$nbrow=3;
|
|
||||||
// Client
|
|
||||||
print "<tr><td>".$langs->trans("Customer")."</td>";
|
|
||||||
print '<td>';
|
|
||||||
print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
|
|
||||||
print '</td>';
|
|
||||||
print '<td rowspan="'.$nbrow.'" valign="top" width="50%">';
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Documents
|
|
||||||
*/
|
|
||||||
$objectref = dol_sanitizeFileName($object->ref);
|
|
||||||
$dir_output = $conf->ficheinter->dir_output . "/";
|
|
||||||
$filepath = $dir_output . $objectref . "/";
|
|
||||||
$file = $filepath . $objectref . ".pdf";
|
|
||||||
$filedetail = $filepath . $objectref . "-detail.pdf";
|
|
||||||
$relativepath = "${objectref}/${objectref}.pdf";
|
|
||||||
$relativepathdetail = "${objectref}/${objectref}-detail.pdf";
|
|
||||||
|
|
||||||
// Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
|
|
||||||
$fileimage = $file.'_preview.png'; // If PDF has 1 page
|
|
||||||
$fileimagebis = $file.'_preview-0.pdf.png'; // If PDF has more than one page
|
|
||||||
$relativepathimage = $relativepath.'_preview.png';
|
|
||||||
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
// Si fichier PDF existe
|
|
||||||
if (file_exists($file))
|
|
||||||
{
|
|
||||||
$encfile = urlencode($file);
|
|
||||||
print load_fiche_titre($langs->trans("Documents"));
|
|
||||||
print '<table class="border" width="100%">';
|
|
||||||
|
|
||||||
print "<tr ".$bc[$var]."><td>".$langs->trans("Intervention")." PDF</td>";
|
|
||||||
|
|
||||||
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=ficheinter&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
|
|
||||||
print '<td align="right">'.dol_print_size(dol_filesize($file)).'</td>';
|
|
||||||
print '<td align="right">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
// Si fichier detail PDF existe
|
|
||||||
if (file_exists($filedetail))
|
|
||||||
{
|
|
||||||
print "<tr ".$bc[$var]."><td>Fiche d'intervention detaillee</td>";
|
|
||||||
|
|
||||||
print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=ficheinter&file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
|
|
||||||
print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';
|
|
||||||
print '<td align="right">'.dol_print_date(dol_filemtime($filedetail),'dayhour').'</td>';
|
|
||||||
print '</tr>';
|
|
||||||
}
|
|
||||||
print "</table>\n";
|
|
||||||
|
|
||||||
// Conversion du PDF en image png si fichier png non existant
|
|
||||||
if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
|
|
||||||
{
|
|
||||||
if (class_exists("Imagick"))
|
|
||||||
{
|
|
||||||
$ret = dol_convert_file($file,'png',$fileimage);
|
|
||||||
if ($ret < 0) $error++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$langs->load("errors");
|
|
||||||
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</td></tr>";
|
|
||||||
|
|
||||||
// Statut
|
|
||||||
print '<tr><td>'.$langs->trans("Status").'</td>';
|
|
||||||
print "<td>".$object->getLibStatut(4)."</td>\n";
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
// Date
|
|
||||||
print '<tr><td>'.$langs->trans("Date").'</td>';
|
|
||||||
print "<td>".dol_print_date($object->datec,"daytext")."</td>\n";
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
print '</table>';
|
|
||||||
|
|
||||||
dol_fiche_end();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Object not found
|
|
||||||
print $langs->trans("ErrorFichinterNotFound",$id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si fichier png PDF d'1 page trouve
|
|
||||||
if (file_exists($fileimage))
|
|
||||||
{
|
|
||||||
print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($relativepathimage).'">';
|
|
||||||
}
|
|
||||||
// Si fichier png PDF de plus d'1 page trouve
|
|
||||||
elseif (file_exists($fileimagebis))
|
|
||||||
{
|
|
||||||
$multiple = $relativepath . "-";
|
|
||||||
|
|
||||||
for ($i = 0; $i < 20; $i++)
|
|
||||||
{
|
|
||||||
$preview = $multiple.$i.'.png';
|
|
||||||
|
|
||||||
if (file_exists($dir_output.$preview))
|
|
||||||
{
|
|
||||||
print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
llxFooter();
|
|
||||||
|
|
||||||
$db->close();
|
|
||||||
@@ -1079,7 +1079,7 @@ else if ($id > 0 || ! empty($ref))
|
|||||||
|
|
||||||
$head = fichinter_prepare_head($object);
|
$head = fichinter_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
|
dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention');
|
||||||
|
|
||||||
$formconfirm='';
|
$formconfirm='';
|
||||||
|
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
$object->fetch_thirdparty();
|
$object->fetch_thirdparty();
|
||||||
|
|
||||||
$head = fichinter_prepare_head($object);
|
$head = fichinter_prepare_head($object);
|
||||||
dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), 0, 'intervention');
|
dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention');
|
||||||
|
|
||||||
|
|
||||||
// Intervention card
|
// Intervention card
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ if ($object->id)
|
|||||||
|
|
||||||
$head=fichinter_prepare_head($object);
|
$head=fichinter_prepare_head($object);
|
||||||
|
|
||||||
dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), 0, 'intervention');
|
dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention');
|
||||||
|
|
||||||
|
|
||||||
// Construit liste des fichiers
|
// Construit liste des fichiers
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ $object->fetch_thirdparty();
|
|||||||
$object->info($object->id);
|
$object->info($object->id);
|
||||||
|
|
||||||
$head = fichinter_prepare_head($object);
|
$head = fichinter_prepare_head($object);
|
||||||
dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), 0, 'intervention');
|
dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention');
|
||||||
|
|
||||||
// Intervention card
|
// Intervention card
|
||||||
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
$object->fetch_thirdparty();
|
$object->fetch_thirdparty();
|
||||||
|
|
||||||
$head = fichinter_prepare_head($object);
|
$head = fichinter_prepare_head($object);
|
||||||
dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), 0, 'intervention');
|
dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention');
|
||||||
|
|
||||||
// Intervention card
|
// Intervention card
|
||||||
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|||||||
@@ -568,6 +568,7 @@ if (! empty($valid_dashboardlines))
|
|||||||
{
|
{
|
||||||
$boxwork .= '<div class="dashboardlinelatecoin nowrap">';
|
$boxwork .= '<div class="dashboardlinelatecoin nowrap">';
|
||||||
$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
|
$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
|
||||||
|
//$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
|
||||||
$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
|
$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
|
||||||
$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
|
$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
|
||||||
$boxwork .= $board->nbtodolate;
|
$boxwork .= $board->nbtodolate;
|
||||||
|
|||||||
@@ -848,9 +848,9 @@ if (! defined('NOREQUIRETRAN'))
|
|||||||
|
|
||||||
// Define some constants used for style of arrays
|
// Define some constants used for style of arrays
|
||||||
$bc=array(0=>'class="impair"',1=>'class="pair"');
|
$bc=array(0=>'class="impair"',1=>'class="pair"');
|
||||||
$bcdd=array(0=>'class="impair drag drop"',1=>'class="pair drag drop"');
|
$bcdd=array(0=>'class="drag drop"',1=>'class="drag drop"');
|
||||||
$bcnd=array(0=>'class="impair nodrag nodrop nohover"',1=>'class="pair nodrag nodrop nohoverpair"'); // Used for tr to add new lines
|
$bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
|
||||||
$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
|
$bctag=array(0=>'class="tagtr"',1=>'class="pair tagtr"');
|
||||||
|
|
||||||
// Define messages variables
|
// Define messages variables
|
||||||
$mesg=''; $warning=''; $error=0;
|
$mesg=''; $warning=''; $error=0;
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ else
|
|||||||
|
|
||||||
$head=actions_prepare_head($act);
|
$head=actions_prepare_head($act);
|
||||||
|
|
||||||
dol_fiche_head($head, 'resources', $langs->trans("Action"),0,'action');
|
dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
|
||||||
|
|
||||||
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
||||||
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
|
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
|
||||||
@@ -327,7 +327,7 @@ else
|
|||||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
|
||||||
$head = societe_prepare_head($socstatic);
|
$head = societe_prepare_head($socstatic);
|
||||||
|
|
||||||
dol_fiche_head($head, 'resources', $langs->trans("ThirdParty"), 0, 'company');
|
dol_fiche_head($head, 'resources', $langs->trans("ThirdParty"), -1, 'company');
|
||||||
|
|
||||||
dol_banner_tab($socstatic, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', '&element='.$element);
|
dol_banner_tab($socstatic, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', '&element='.$element);
|
||||||
|
|
||||||
@@ -363,7 +363,7 @@ else
|
|||||||
if (is_object($fichinter))
|
if (is_object($fichinter))
|
||||||
{
|
{
|
||||||
$head=fichinter_prepare_head($fichinter);
|
$head=fichinter_prepare_head($fichinter);
|
||||||
dol_fiche_head($head, 'resource', $langs->trans("InterventionCard"),0,'intervention');
|
dol_fiche_head($head, 'resource', $langs->trans("InterventionCard"), -1, 'intervention');
|
||||||
|
|
||||||
// Intervention card
|
// Intervention card
|
||||||
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|||||||
@@ -2462,7 +2462,7 @@ div.refidpadding {
|
|||||||
}
|
}
|
||||||
div.refid {
|
div.refid {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #866;
|
color: #868;
|
||||||
font-size: 160%;
|
font-size: 160%;
|
||||||
}
|
}
|
||||||
div.refidno {
|
div.refidno {
|
||||||
@@ -2916,6 +2916,7 @@ span.boxstatstext {
|
|||||||
span.boxstatsindicator {
|
span.boxstatsindicator {
|
||||||
font-size: 130%;
|
font-size: 130%;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
line-height: 29px;
|
||||||
}
|
}
|
||||||
span.dashboardlineindicator, span.dashboardlineindicatorlate {
|
span.dashboardlineindicator, span.dashboardlineindicatorlate {
|
||||||
font-size: 130%;
|
font-size: 130%;
|
||||||
@@ -2929,17 +2930,32 @@ span.dashboardlineok {
|
|||||||
}
|
}
|
||||||
span.dashboardlineko {
|
span.dashboardlineko {
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
|
/*color: #8c4446 ! important;
|
||||||
|
padding-left: 1px;*/
|
||||||
|
|
||||||
font-size: 80%;
|
font-size: 80%;
|
||||||
}
|
}
|
||||||
.dashboardlinelatecoin {
|
.dashboardlinelatecoin {
|
||||||
float: right;
|
float: right;
|
||||||
position: relative;
|
position: relative;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
top: -28px;
|
top: -24px;
|
||||||
padding: 1px 6px 1px 6px;
|
padding: 1px 2px 1px 2px;
|
||||||
|
border-radius: .25em;
|
||||||
|
|
||||||
|
background-color: #af4705;
|
||||||
|
padding: 0px 5px 0px 5px;
|
||||||
|
top: -26px;
|
||||||
|
}
|
||||||
|
.imglatecoin {
|
||||||
|
padding: 1px 3px 1px 1px;
|
||||||
|
margin-left: 4px;
|
||||||
|
margin-right: 2px;
|
||||||
background-color: #8c4446;
|
background-color: #8c4446;
|
||||||
color: #FFFFFF ! important;
|
color: #FFFFFF ! important;
|
||||||
border-radius: .25em;
|
border-radius: .25em;
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.boxtable {
|
.boxtable {
|
||||||
margin-bottom: 8px !important;
|
margin-bottom: 8px !important;
|
||||||
|
|||||||
Reference in New Issue
Block a user