diff --git a/ChangeLog b/ChangeLog index 654817fb1684c5b9ffbc4a1526d97595bed3c34a..c72f312e91895a7a73c555af61694fd14d201876 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ Fix: user right on Holiday for month report nor working. Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work Fix: Bad space in predefined messages. Fix: Signature was not added for email sent from thirdparty page. +Fix: Action event SHIPPING_VALIDATE is not implemented ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index b089b5487a74e93f10b31cd1efb158520f0624f5..6ab80b6ad883a3986f990bdc09e2ea8fcac95e24 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -1,7 +1,7 @@ <?php /* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2009-2011 Regis Houssin <regis.houssin@capnetworks.com> - * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013 Cedric GROSS <c.gross@kreiz-it.fr> * * This program is free software; you can redistribute it and/or modify @@ -373,6 +373,25 @@ class InterfaceActionsAuto // Parameters $object->sendotid defined by caller //$object->sendtoid=0; $ok=1; + } + elseif ($action == 'SHIPPING_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("sendings"); + $langs->load("agenda"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",$object->ref); + if (empty($object->actionmsg)) + { + $object->actionmsg=$langs->transnoentities("ShippingValidated",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Parameters $object->sendtoid defined by caller + //$object->sendtoid=0; + $ok=1; } elseif ($action == 'SHIPPING_SENTBYMAIL') { diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 238911047e316a9ea66d7db453c94775433d0a54..f0612d4abe2b0b10aeb1d756880f7a3b3adc68a5 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -52,6 +52,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 +ShippingValidated=Expedició %s validada InterventionSentByEMail=Intervenció %s enviada per e-mail NewCompanyToDolibarr= Tercer creat DateActionPlannedStart= Data d'inici prevista diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 187f818210ebd972d369b85b4ff04307a1f9cd10..0e37d3290f7f50aee6c6e2859762eb83b6f66b9b 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -52,6 +52,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 +ShippingValidated= Shipping %s validated InterventionSentByEMail=Intervention %s sent by EMail NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index 7abb1dd277b9bf9456a4e1aa69dff5dd0de7a33b..d832ae6afb5dec0fdb40b7267f6c6fca8af87dfc 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -52,6 +52,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 +ShippingValidated= Expedición %s validada InterventionSentByEMail=Intervención %s enviada por e-mail NewCompanyToDolibarr= Tercero creado DateActionPlannedStart= Fecha de inicio prevista diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 190c08ad2acce87aaa40e359422c0ec1be3ed886..d21617fde47ffd55c0ad937fcd8d7c1ebabc99ea 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -52,6 +52,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 +ShippingValidated=Bon d'expédition %s validée InterventionSentByEMail=Intervention %s envoyée par Email NewCompanyToDolibarr= Tiers créé DateActionPlannedStart= Date de début de réalisation prévue