Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

ChangeLog

@@ -40,6 +40,7 @@ For users:
 - New: Add field url as product properties.
 - New: More options to create a credit note (can be filled autatically according to remain to pay).
 - Fix: Project Task numbering customs rule works.
+- Fix: Add actions events not implemented
 
 TODO
 - New: Predefined product and free product use same form.

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

 <?php
 /* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011-2014 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
@@ -426,6 +426,34 @@ class InterfaceActionsAuto
             $object->sendtoid=0;
             $ok=1;
 		}
+		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("orders");
+			$langs->load("agenda");
+		
+			$object->actiontypecode='AC_OTH_AUTO';
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+		
+			$object->sendtoid=0;
+			$ok=1;
+		}
+		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("orders");
+			$langs->load("agenda");
+		
+			$object->actiontypecode='AC_OTH_AUTO';
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+		
+			$object->sendtoid=0;
+			$ok=1;
+		}
         elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

htdocs/fourn/facture/fiche.php

@@ -4,7 +4,7 @@
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
  * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  *
@@ -824,7 +824,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
                 {
                     if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
                     else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
-                    $actiontypecode='AC_SUP_ORD';
+                    $actiontypecode='AC_SUP_INV';
                     $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
                     if ($message)
                     {

htdocs/langs/en_US/agenda.lang

@@ -43,6 +43,7 @@ InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
 OrderValidatedInDolibarr= Order %s validated
 OrderApprovedInDolibarr=Order %s approved
+OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
 OrderCanceledInDolibarr=Order %s canceled
 InterventionValidatedInDolibarr=Intervention %s validated