lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Interventions: Add actions info

Browse Source
This commit is contained in:
Juanjo Menent 2011-07-07 09:18:27 +00:00
parent f99acd0f3f
commit eaa6ba90ec
11 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formactions.class.php
View File

@ -1,5 +1,7 @@
<?php
/* Copyright (c) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 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
@ -20,7 +22,7 @@
* \file htdocs/core/class/html.formactions.class.php
* \ingroup core
* \brief Fichier de la classe des fonctions predefinie de composants html actions
* \version $Id$
* \version $Id: html.formactions.class.php,v 1.19 2011/07/07 09:18:27 simnandez Exp $
*/
@ -95,7 +97,7 @@ class FormActions
/**
* Show list of actions for element
* @param object Object
* @param typeelement 'invoice','propal','order','invoice_supplier','order_supplier'
* @param typeelement 'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
* @param socid socid of user
* @return int <0 if KO, >=0 if OK
*/
@ -119,6 +121,7 @@ class FormActions
if ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') $title=$langs->trans('ActionsOnOrder');
if ($typeelement == 'project') $title=$langs->trans('ActionsOnProject');
if ($typeelement == 'shipping') $title=$langs->trans('ActionsOnShipping');
if ($typeelement == 'fichinter') $title=$langs->trans('ActionsOnFicheInter');
print_titre($title);

12
htdocs/fichinter/fiche.php
View File

@ -23,7 +23,7 @@
* \file htdocs/fichinter/fiche.php
* \brief Fichier fiche intervention
* \ingroup ficheinter
* \version $Id: fiche.php,v 1.166 2011/07/06 09:39:04 simnandez Exp $
* \version $Id: fiche.php,v 1.167 2011/07/07 09:18:27 simnandez Exp $
*/
require("../main.inc.php");
@ -1163,13 +1163,19 @@ elseif ($fichinterid)
$var=true;
print "<br>\n";
//print "<br>\n";
$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$societe->default_lang);
/*
* Linked object block
*/
$somethingshown=$object->showLinkedObjectBlock();
print '</td><td valign="top" width="50%">';
// List of actions on element
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php');
$formactions=new FormActions($db);
$somethingshown=$formactions->showactions($object,'fichinter',$socid);
print "</td><td>";
print "&nbsp;</td>";
print "</tr></table>\n";
@ -1178,5 +1184,5 @@ elseif ($fichinterid)
$db->close();
llxFooter('$Date: 2011/07/06 09:39:04 $ - $Revision: 1.166 $');
llxFooter('$Date: 2011/07/07 09:18:27 $ - $Revision: 1.167 $');
?>

10
htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
View File

@ -1,5 +1,7 @@
<?php
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 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
@ -20,7 +22,7 @@
* \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
* \ingroup agenda
* \brief Trigger file for agenda module
* \version $Id$
* \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
*/
@ -330,9 +332,9 @@ class InterfaceActionsAuto
$langs->load("interventions");
$langs->load("agenda");
$object->actiontypecode='AC_OTH';
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
$object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
$object->actiontypecode='AC_EMAIL';
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
// Parameters $object->sendotid defined by caller

1
htdocs/langs/ca_ES/agenda.lang
View File

@ -44,6 +44,7 @@ InvoiceSentByEMail=Factura a client %s enviada per e-mail
SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail
SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail
ShippingSentByEMail=Expedició %s enviada per e-mail
InterventionSentByEMail=Intervenció %s enviada per e-mail
NewCompanyToDolibarr= Tercer creat
DateActionPlannedStart= Data d'inici prevista
DateActionPlannedEnd= Data fi prevista

1
htdocs/langs/ca_ES/interventions.lang
View File

@ -7,6 +7,7 @@ NewIntervention=Nova itervenció
AddIntervention=Crear intervenció
ListOfInterventions=Llista d'intervencions
EditIntervention=Editar
ActionsOnFicheInter=Esdeveniments sobre l'intervenció
LastInterventions=Les %s darreres intervencions
AllInterventions=Totes les intervencions
CreateDraftIntervention=Crear esborrany

1
htdocs/langs/en_US/agenda.lang
View File

@ -44,6 +44,7 @@ InvoiceSentByEMail=Customer invoice %s sent by EMail
SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
InterventionSentByEMail=Intervention %s sent by EMail
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date

1
htdocs/langs/en_US/interventions.lang
View File

@ -7,6 +7,7 @@ NewIntervention=New intervention
AddIntervention=Add intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
LastInterventions=Last %s interventions
AllInterventions=All interventions
CreateDraftIntervention=Create draft

1
htdocs/langs/es_ES/agenda.lang
View File

@ -44,6 +44,7 @@ InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
SupplierOrderSentByEMail=Pedido a proveedor %s enviada por e-mail
SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
ShippingSentByEMail=Expedición %s enviada por e-mail
InterventionSentByEMail=Intervención %s enviada por e-mail
NewCompanyToDolibarr=Tercero creado
DateActionPlannedStart=Fecha de inicio prevista
DateActionPlannedEnd=Fecha de fin prevista

1
htdocs/langs/es_ES/interventions.lang
View File

@ -7,6 +7,7 @@ NewIntervention=Nueva intevención
AddIntervention=Crear intervención
ListOfInterventions=Listado de intervenciones
EditIntervention=Editar
ActionsOnFicheInter=Eventos sobre la intervención
LastInterventions=Las %s últimas intervenciones
AllInterventions=Todas las intervenciones
CreateDraftIntervention=Crear borrador

1
htdocs/langs/fr_FR/agenda.lang
View File

@ -44,6 +44,7 @@ InvoiceSentByEMail=Facture client %s envoyée par EMail
SupplierOrderSentByEMail=Commande fournisseur %s envoyée par EMail
SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par EMail
ShippingSentByEMail=Bon d'expédition %s envoyé par EMail
InterventionSentByEMail=Intervention %s envoyée par EMail
NewCompanyToDolibarr=Tiers créé
DateActionPlannedStart=Date début réalisation prévue
DateActionPlannedEnd=Date fin réalisation prévue

1
htdocs/langs/fr_FR/interventions.lang
View File

@ -7,6 +7,7 @@ NewIntervention=Nouvelle intervention
AddIntervention=Créer intervention
ListOfInterventions=Liste des interventions
EditIntervention=Editer
ActionsOnFicheInter=Événements sur l'intervention
LastInterventions=Les %s dernières interventions
AllInterventions=Toutes les interventions
CreateDraftIntervention=Créer brouillon