diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 6b8ee25caff..34c168ab12f 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -1,5 +1,7 @@ + * Copyright (C) 2010-2011 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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); diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index cff0a1be34f..5a255287010 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -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 "
\n"; + //print "
\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 ''; + // 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 ""; print " "; print "\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 $'); ?> diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php index a3a4b1b8756..2ff7b4003b3 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php @@ -1,5 +1,7 @@ + * Copyright (C) 2009-2011 Regis Houssin + * Copyright (C) 2011 Juanjo Menent * * 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 diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 52b069bb55f..3aa77e663e7 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -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 diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 9cccf6451d9..0765d14ecd9 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -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 diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index fc7cc376e8d..8fff67a3cfa 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -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 diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 4dea3b3e7d4..1b531deed38 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -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 diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index a2660ca5268..a1c818aa7d2 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -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 diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang index 05f494afcf9..4b6497ed514 100644 --- a/htdocs/langs/es_ES/interventions.lang +++ b/htdocs/langs/es_ES/interventions.lang @@ -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 diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index a3ad1a841f2..8ca6f98ad3b 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -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 diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index c78f6e9da84..a4089d2b66e 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -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