From 4ff570571e46012f29c4bae291fdb2f985782b0b Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Wed, 29 Oct 2014 05:13:15 +0100
Subject: [PATCH 1/9] Added SOAP client for creating a client order in remote
 webservice that thirdparty might have.

---
 htdocs/fourn/commande/card.php | 507 ++++++++++++++++++++++++++-------
 1 file changed, 400 insertions(+), 107 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index da4f13e6d53..72c091ff156 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -43,7 +43,9 @@ if (!empty($conf->produit->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once NUSOAP_PATH.'/nusoap.php';     // Include SOAP
 
+$langs->load('admin');
 $langs->load('orders');
 $langs->load('sendings');
 $langs->load('companies');
@@ -1044,6 +1046,91 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
     }
 }
 
+if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel'))
+{
+    $ws_host        = GETPOST('ws_host','alpha');
+    $ws_key         = GETPOST('ws_key','alpha');
+    $ws_user        = GETPOST('ws_user','alpha');
+    $ws_password    = GETPOST('ws_password','alpha');
+    $ws_entity      = GETPOST('ws_entity','int');
+    $ws_thirdparty  = GETPOST('ws_thirdparty','int');
+
+    // NS and Authentication parameters
+    $ws_ns='http://www.dolibarr.org/ns/';
+    $ws_authentication=array(
+        'dolibarrkey'=>$ws_key,
+        'sourceapplication'=>'DolibarrWebServiceClient',
+        'login'=>$ws_user,
+        'password'=>$ws_password,
+        'entity'=>$ws_entity
+    );
+
+    //Is everything filled?
+    if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) {
+        setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
+    }
+    else
+    {
+        //Create SOAP client and connect it to order
+        $soapclient_order = new nusoap_client($ws_host."/webservices/server_order.php");
+        $soapclient_order->soap_defencoding='UTF-8';
+        $soapclient_order->decodeUTF8(false);
+
+        //Create SOAP client and connect it to product/service
+        $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php");
+        $soapclient_product->soap_defencoding='UTF-8';
+        $soapclient_product->decodeUTF8(false);
+
+        //Prepare the order lines from order
+        $order_lines = array();
+        foreach ($object->lines as $line)
+        {
+            $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $line->ref_supplier);
+            $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+
+            if ($result_product["result"]["result_code"] == "OK")
+            {
+                $order_lines[] = array(
+                    'desc'          => $line->product_desc,
+                    'type'          => $line->product_type,
+                    'product_id'    => $result_product["product"]["id"],
+                    'vat_rate'      => $line->tva_tx,
+                    'qty'           => $line->qty,
+                    'price'         => $line->price,
+                    'unitprice'     => $line->subprice,
+                    'total_net'     => $line->total_ht,
+                    'total_vat'     => $line->total_tva,
+                    'total'         => $line->total_ttc,
+                    'date_start'    => $line->date_start,
+                    'date_end'      => $line->date_end,
+                );
+            }
+        }
+
+        //Prepare the order header
+        $order = array(
+            'thirdparty_id' => $ws_thirdparty,
+            'date'          => dol_print_date(dol_now(),'dayrfc'),
+            'total_net'     => $object->total_ht,
+            'total_var'     => $object->total_tva,
+            'total'         => $object->total_ttc,
+            'lines'         => $order_lines
+        );
+
+        $ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
+        $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
+
+        if ($result_order["result"]["result_code"] != "OK")
+        {
+            setEventMessage($langs->trans("SOAPError").$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
+        }
+        else
+        {
+            setEventMessage($langs->trans("RemoteOrderRef").$result_order["ref"], 'mesgs');
+        }
+    }
+}
+
 if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
 {
 	if ($action == 'addcontact')
@@ -1769,7 +1856,313 @@ elseif (! empty($object->id))
 	dol_fiche_end();
 
 
-	if ($action != 'presend')
+	/*
+	 * Action presend
+	 */
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
+		$file=$fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->client->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
+			$file=$fileparams['fullname'];
+		}
+
+		print '<br>';
+
+		print_titre($langs->trans('SendOrderByMail'));
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
+		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
+		$formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+		// Tableau des substitutions
+		$formmail->substit['__ORDERREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		//Find the good contact adress
+		$custcontact='';
+		$contactarr=array();
+		$contactarr=$object->liste_contact(-1,'external');
+
+		if (is_array($contactarr) && count($contactarr)>0) {
+			foreach($contactarr as $contact) {
+				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+					$contactstatic=new Contact($db);
+					$contactstatic->fetch($contact['id']);
+					$custcontact=$contactstatic->getFullName($langs,1);
+				}
+			}
+
+			if (!empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='order_supplier_send';
+		$formmail->param['orderid']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		print '<br>';
+	}
+	/*
+	 * Action webservice
+	 */
+	elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel'))
+	{
+		$mode        = GETPOST('mode', 'alpha');
+		$ws_host     = GETPOST('ws_host','alpha');
+		$ws_key      = GETPOST('ws_key','alpha');
+		$ws_user     = GETPOST('ws_user','alpha');
+		$ws_password = GETPOST('ws_password','alpha');
+        
+        // NS and Authentication parameters
+        $ws_ns = 'http://www.dolibarr.org/ns/';
+        $ws_authentication = array(
+            'dolibarrkey'=>$ws_key,
+            'sourceapplication'=>'DolibarrWebServiceClient',
+            'login'=>$ws_user,
+            'password'=>$ws_password,
+            'entity'=>''
+        );
+
+        print_titre($langs->trans('CreateRemoteOrder'));
+
+        //Is everything filled?
+        if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password))) {
+            setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); 
+            $mode = "init";
+        }
+
+        if ($mode == "init") 
+        {
+            //Table/form header
+            print '<table class="border" width="100%">';
+            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="webservice">';
+            print '<input type="hidden" name="mode" value="check">';
+            $textinput_size = "50";
+
+            //Remote Host URL
+            print '<tr><td>'.$langs->trans("Host").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_host"></td></tr>';
+
+            //Remote Webservices key
+            print '<tr><td>'.$langs->trans("KeyForWebServicesAccess").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_key"></td></tr>';
+
+            //Remote User
+            print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
+
+            //Remote Password
+            print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
+
+            //Submit and cancel buttons
+            print '<tr><td align="center" colspan="2">';
+            print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+            print ' &nbsp; &nbsp; ';
+            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '</td></tr>';
+
+            //End table/form
+            print '</form>';
+            print '</table>';
+        }
+        elseif ($mode == "check")
+        {
+            $ws_entity = '';
+            $ws_thirdparty = '';
+            $error_occurred = false;
+
+            //Check if has transport, without any the soap client will give error
+            if (strpos($ws_host, "http") === false)
+            {
+                $ws_host = "http://".$ws_host;
+            }
+
+            //Create SOAP client and connect it to user
+            $soapclient_user = new nusoap_client($ws_host."/webservices/server_user.php");
+            $soapclient_user->soap_defencoding='UTF-8';
+            $soapclient_user->decodeUTF8(false);
+
+            //Get the thirdparty associated to user
+            $ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
+            $result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
+            $user_status_code = $result_user["result"]["result_code"];
+
+            if ($user_status_code == "OK")
+            {
+                //Fill the variables
+                $ws_entity = $result_user["user"]["entity"];
+                $ws_authentication['entity'] = $ws_entity;
+                $ws_thirdparty = $result_user["user"]["fk_thirdparty"];
+                if (empty($ws_thirdparty))
+                {
+                    setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors');
+                }
+                else
+                {
+                    //Create SOAP client and connect it to product/service
+                    $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php");
+                    $soapclient_product->soap_defencoding='UTF-8';
+                    $soapclient_product->decodeUTF8(false);
+
+                    // Iterate each line and get the reference that uses the supplier of that product/service
+                    $i = 0;
+                    foreach ($object->lines as $line) {
+                        $i = $i + 1;
+                        $ref_supplier = $line->ref_supplier;
+                        $line_id = $i."º) ".$line->product_ref.": ";
+                        if (empty($ref_supplier)) {
+                            continue;
+                        }
+                        $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
+                        $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+                        if (!$result_product)
+                        {
+                            setEventMessage($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, 'errors');
+                            $error_occurred = true;
+                            break;
+                        }
+
+                        // Check the result code
+                        $status_code = $result_product["result"]["result_code"];
+                        if ($status_code != "OK")
+                        {
+                            if ($status_code == "NOT_FOUND")
+                            {
+                                setEventMessage($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", 'warnings');
+                            }
+                            else
+                            {
+                                setEventMessage($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", 'errors');
+                                $error_occurred = true;
+                                break;
+                            }
+                        }
+
+                        
+                        // Ensure that price is equal and warn user if it's not
+                        $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
+                        $local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
+
+                        $product_fourn = new ProductFournisseur($db);
+                        $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
+                        if (count($product_fourn_list)>0)
+                        {
+                            foreach($product_fourn_list as $product_fourn_line)
+                            {
+                                //Only accept the line where the supplier is the same at this order and has the same ref
+                                if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
+                                    $local_price = price($product_fourn_line->fourn_price);
+                                }
+                            }
+                        }
+
+                        if ($local_price != NULL && $local_price != $supplier_price) {
+                            setEventMessage($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, 'warnings');
+                        }
+
+                        // Check if is in sale
+                        if (empty($result_product["product"]["status_tosell"])) {
+                            setEventMessage($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", 'warnings');
+                        }
+                    }
+                }
+
+            }
+            elseif ($user_status_code == "PERMISSION_DENIED")
+            {
+                setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors');
+            }
+            else
+            {
+                setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors');
+            }
+
+            //Form
+            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="webservice">';
+            print '<input type="hidden" name="mode" value="send">';
+            print '<input type="hidden" name="ws_host" value="'.$ws_host.'">';
+            print '<input type="hidden" name="ws_key" value="'.$ws_key.'">';
+            print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
+            print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
+            print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
+            print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
+            if ($error_occurred)
+            {
+                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>"; //TODO: Translate
+            }
+            else
+            {
+                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
+                print ' &nbsp; &nbsp; ';
+            }
+            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '</form>';
+        }
+	}
+	/*
+	 * Show buttons
+	 */
+	else
 	{
 		/**
 		 * Boutons actions
@@ -1849,6 +2242,12 @@ elseif (! empty($object->id))
 					//}
 				}
 
+				// Create a remote order using WebService
+				if ($object->statut >= 2) // 2 means accepted
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=webservice&amp;mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
+				}
+
 				// Cancel
 				if ($object->statut == 2)
 				{
@@ -1975,112 +2374,6 @@ elseif (! empty($object->id))
 		print '</div></div></div>';
 	}
 
-	/*
-	 * Action presend
-	 */
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
-		$file=$fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->client->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
-			$file=$fileparams['fullname'];
-		}
-
-		print '<br>';
-
-		print_titre($langs->trans('SendOrderByMail'));
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->substit['__ORDERREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='order_supplier_send';
-		$formmail->param['orderid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		print '<br>';
-	}
-
 	print '</td></tr></table>';
 }
 

From e875f0c2b8c402fd7f10a11f8b8e903f7380d6fb Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Wed, 29 Oct 2014 05:33:59 +0100
Subject: [PATCH 2/9] Fixed missing separator

---
 htdocs/fourn/commande/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 72c091ff156..b8d9d74e147 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1122,11 +1122,11 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('
 
         if ($result_order["result"]["result_code"] != "OK")
         {
-            setEventMessage($langs->trans("SOAPError").$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
+            setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
         }
         else
         {
-            setEventMessage($langs->trans("RemoteOrderRef").$result_order["ref"], 'mesgs');
+            setEventMessage($langs->trans("RemoteOrderRef")." ".$result_order["ref"], 'mesgs');
         }
     }
 }

From 557cbaf3d7942e68b46e21dd24f18f8e4c78bcde Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Fri, 31 Oct 2014 04:59:57 +0100
Subject: [PATCH 3/9] Added module descriptor and activation checks Corrected 3
 missing $error_occurred flags

---
 .../modSyncSupplierWebServices.class.php      | 121 ++++++++++++++++++
 htdocs/fourn/commande/card.php                |  15 ++-
 2 files changed, 132 insertions(+), 4 deletions(-)
 create mode 100755 htdocs/core/modules/modSyncSupplierWebServices.class.php

diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php
new file mode 100755
index 00000000000..088989f9de4
--- /dev/null
+++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php
@@ -0,0 +1,121 @@
+<?php
+/* Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
+ *
+ * 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/>.
+ */
+
+/**
+ *      \defgroup   webservices     Module webservices
+ *      \brief      Module to enable client for supplier WebServices
+ *       \file       htdocs/core/modules/modSyncSupplierWebServices.class.php
+ *       \ingroup    webservices
+ *       \brief      File to describe client for supplier webservices module
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+/**
+ *	Class to describe a WebServices module
+ */
+class modSyncSupplierWebServices extends DolibarrModules
+{
+
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 2650;
+
+        $this->family = "technic";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Enable the client for external supplier web services";
+        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 1;
+        // Name of image file used for this module.
+        $this->picto='technic';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        //-------------
+        //$this->config_page_url = array("webservices.php@webservices");
+
+        // Dependancies
+        //-------------
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->langfiles = array("other");
+
+        // Constantes
+        //-----------
+        $this->const = array();
+
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
+
+        // Boxes
+        //------
+        $this->boxes = array();
+
+        // Permissions
+        //------------
+        $this->rights = array();
+        $this->rights_class = 'syncsupplierwebservices';
+        $r=0;
+    }
+
+
+    /**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Prevent pb of modules not correctly disabled
+        //$this->remove($options);
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
+
+    /**
+	 *		Function called when module is disabled.
+	 *      Remove from database constants, boxes and permissions from Dolibarr database.
+	 *		Data directories are not deleted
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+     */
+    function remove($options='')
+    {
+		$sql = array();
+
+		return $this->_remove($sql,$options);
+    }
+
+}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b8d9d74e147..263a96bdca4 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
  *
  * 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
@@ -1065,8 +1066,10 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('
         'entity'=>$ws_entity
     );
 
-    //Is everything filled?
-    if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) {
+    //Is sync supplier web services module activated? and everything filled?
+    if (empty($conf->syncsupplierwebservices->enabled)) {
+        setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name")));
+    } else if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) {
         setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
     }
     else
@@ -2054,6 +2057,7 @@ elseif (! empty($object->id))
                 if (empty($ws_thirdparty))
                 {
                     setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors');
+                    $error_occurred = true;
                 }
                 else
                 {
@@ -2129,10 +2133,12 @@ elseif (! empty($object->id))
             elseif ($user_status_code == "PERMISSION_DENIED")
             {
                 setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors');
+                $error_occurred = true;
             }
             else
             {
                 setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors');
+                $error_occurred = true;
             }
 
             //Form
@@ -2242,8 +2248,9 @@ elseif (! empty($object->id))
 					//}
 				}
 
-				// Create a remote order using WebService
-				if ($object->statut >= 2) // 2 means accepted
+
+				// Create a remote order using WebService only if module is activated
+				if (! empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=webservice&amp;mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
 				}

From 82aa8458bf7d5f745bd21a6b7cc8d7924c236d0e Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Fri, 31 Oct 2014 17:46:11 +0100
Subject: [PATCH 4/9] Added ws url/key to thirdparty SQL table, class and info
 page

---
 htdocs/fourn/commande/card.php                | 94 +++++++++++--------
 .../install/mysql/migration/3.6.0-3.7.0.sql   |  3 +
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +
 htdocs/societe/class/societe.class.php        | 23 +++++
 htdocs/societe/soc.php                        | 36 ++++++-
 5 files changed, 117 insertions(+), 41 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 263a96bdca4..4ae8fb17754 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1049,8 +1049,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 
 if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel'))
 {
-    $ws_host        = GETPOST('ws_host','alpha');
-    $ws_key         = GETPOST('ws_key','alpha');
+    $ws_url         = $object->thirdparty->webservices_url;
+    $ws_key         = $object->thirdparty->webservices_key;
     $ws_user        = GETPOST('ws_user','alpha');
     $ws_password    = GETPOST('ws_password','alpha');
     $ws_entity      = GETPOST('ws_entity','int');
@@ -1069,18 +1069,20 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('
     //Is sync supplier web services module activated? and everything filled?
     if (empty($conf->syncsupplierwebservices->enabled)) {
         setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name")));
-    } else if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password) || empty($ws_thirdparty))) {
+    } else if (empty($ws_url) || empty($ws_key)) {
+        setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
+    } else if (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) {
         setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
     }
     else
     {
         //Create SOAP client and connect it to order
-        $soapclient_order = new nusoap_client($ws_host."/webservices/server_order.php");
+        $soapclient_order = new nusoap_client($ws_url."/webservices/server_order.php");
         $soapclient_order->soap_defencoding='UTF-8';
         $soapclient_order->decodeUTF8(false);
 
         //Create SOAP client and connect it to product/service
-        $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php");
+        $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
         $soapclient_product->soap_defencoding='UTF-8';
         $soapclient_product->decodeUTF8(false);
 
@@ -1123,7 +1125,11 @@ if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('
         $ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
         $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
 
-        if ($result_order["result"]["result_code"] != "OK")
+        if (empty($result_order["result"]["result_code"])) //No result, check error str
+        {
+            setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
+        }
+        else if ($result_order["result"]["result_code"] != "OK") //Something went wrong
         {
             setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
         }
@@ -1970,8 +1976,8 @@ elseif (! empty($object->id))
 	elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel'))
 	{
 		$mode        = GETPOST('mode', 'alpha');
-		$ws_host     = GETPOST('ws_host','alpha');
-		$ws_key      = GETPOST('ws_key','alpha');
+		$ws_url      = $object->thirdparty->webservices_url;
+		$ws_key      = $object->thirdparty->webservices_key;
 		$ws_user     = GETPOST('ws_user','alpha');
 		$ws_password = GETPOST('ws_password','alpha');
         
@@ -1988,7 +1994,11 @@ elseif (! empty($object->id))
         print_titre($langs->trans('CreateRemoteOrder'));
 
         //Is everything filled?
-        if ($mode != "init" && (empty($ws_host) || empty($ws_key) || empty($ws_user) || empty($ws_password))) {
+        if (empty($ws_url) || empty($ws_key)) {
+            setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
+            $mode = "init";
+            $error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
+        } else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
             setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); 
             $mode = "init";
         }
@@ -2001,26 +2011,29 @@ elseif (! empty($object->id))
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="webservice">';
             print '<input type="hidden" name="mode" value="check">';
-            $textinput_size = "50";
 
-            //Remote Host URL
-            print '<tr><td>'.$langs->trans("Host").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_host"></td></tr>';
-
-            //Remote Webservices key
-            print '<tr><td>'.$langs->trans("KeyForWebServicesAccess").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_key"></td></tr>';
-
-            //Remote User
-            print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
-
-            //Remote Password
-            print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
-
-            //Submit and cancel buttons
-            print '<tr><td align="center" colspan="2">';
-            print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
-            print ' &nbsp; &nbsp; ';
-            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</td></tr>';
+            if ($error_occurred)
+            {
+                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+            }
+            else
+            {
+                $textinput_size = "50";
+                // Webservice url
+                print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
+                //Remote User
+                print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
+                //Remote Password
+                print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
+                //Submit button
+                print '<tr><td align="center" colspan="2">';
+                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+                print ' &nbsp; &nbsp; ';
+                //Cancel button
+                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td></tr>';
+            }
 
             //End table/form
             print '</form>';
@@ -2032,14 +2045,8 @@ elseif (! empty($object->id))
             $ws_thirdparty = '';
             $error_occurred = false;
 
-            //Check if has transport, without any the soap client will give error
-            if (strpos($ws_host, "http") === false)
-            {
-                $ws_host = "http://".$ws_host;
-            }
-
             //Create SOAP client and connect it to user
-            $soapclient_user = new nusoap_client($ws_host."/webservices/server_user.php");
+            $soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
             $soapclient_user->soap_defencoding='UTF-8';
             $soapclient_user->decodeUTF8(false);
 
@@ -2062,7 +2069,7 @@ elseif (! empty($object->id))
                 else
                 {
                     //Create SOAP client and connect it to product/service
-                    $soapclient_product = new nusoap_client($ws_host."/webservices/server_productorservice.php");
+                    $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
                     $soapclient_product->soap_defencoding='UTF-8';
                     $soapclient_product->decodeUTF8(false);
 
@@ -2086,7 +2093,11 @@ elseif (! empty($object->id))
 
                         // Check the result code
                         $status_code = $result_product["result"]["result_code"];
-                        if ($status_code != "OK")
+                        if (empty($status_code)) //No result, check error str
+                        {
+                            setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
+                        }
+                        else if ($status_code != "OK") //Something went wrong
                         {
                             if ($status_code == "NOT_FOUND")
                             {
@@ -2135,6 +2146,11 @@ elseif (! empty($object->id))
                 setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors');
                 $error_occurred = true;
             }
+            elseif ($user_status_code == "BAD_CREDENTIALS")
+            {
+                setEventMessage($langs->trans("RemoteUserBadCredentials"), 'errors');
+                $error_occurred = true;
+            }
             else
             {
                 setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors');
@@ -2146,15 +2162,13 @@ elseif (! empty($object->id))
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="webservice">';
             print '<input type="hidden" name="mode" value="send">';
-            print '<input type="hidden" name="ws_host" value="'.$ws_host.'">';
-            print '<input type="hidden" name="ws_key" value="'.$ws_key.'">';
             print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
             print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
             print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
             print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
             if ($error_occurred)
             {
-                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>"; //TODO: Translate
+                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
             }
             else
             {
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index c2e10543b7a..552563db677 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1110,3 +1110,6 @@ DELETE FROM llx_menu WHERE module = 'boutique';
 -- Add option always editable on extrafield
 ALTER TABLE llx_extrafields ADD alwayseditable INTEGER DEFAULT 0 AFTER pos;
 
+-- add supplier webservice fields
+ALTER TABLE llx_societe ADD webservices_url varchar(255) DEFAULT NULL;
+ALTER TABLE llx_societe ADD webservices_key varchar(128) DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index bfe69b0d5f8..b9327ba521c 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -92,4 +92,6 @@ create table llx_societe
   logo                     varchar(255),
   canvas				   varchar(32),			                        -- type of canvas if used (null by default)
   import_key               varchar(14)                          		-- import key
+  webservices_url          varchar(255),                            -- supplier webservice url
+  webservices_key          varchar(128),                            -- supplier webservice key
 )ENGINE=innodb;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6d80189c7be..79d24a8d917 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -334,6 +334,18 @@ class Societe extends CommonObject
      */
     var $import_key;
 
+    /**
+     * Supplier WebServices URL
+     * @var string
+     */
+    var $webservices_url;
+
+    /**
+     * Supplier WebServices Key
+     * @var string
+     */
+    var $webservices_key;
+
     var $logo;
     var $logo_small;
     var $logo_mini;
@@ -715,6 +727,10 @@ class Societe extends CommonObject
         	$supplier=true;
         }
 
+        //Web services
+        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+        $this->webservices_key = trim($this->webservices_key);
+
         $this->db->begin();
 
         // Check name is required and codes are ok or unique.
@@ -795,6 +811,9 @@ class Societe extends CommonObject
             $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->default_lang."'":"null");
             $sql .= ",logo = ".(! empty($this->logo)?"'".$this->logo."'":"null");
 
+            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
+            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+
             if ($customer)
             {
                 $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
@@ -951,6 +970,7 @@ class Societe extends CommonObject
         $sql .= ', s.fk_typent as typent_id';
         $sql .= ', s.fk_effectif as effectif_id';
         $sql .= ', s.fk_forme_juridique as forme_juridique_code';
+        $sql .= ', s.webservices_url, s.webservices_key';
         $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
         $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj';
         $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
@@ -1086,6 +1106,9 @@ class Societe extends CommonObject
                 $this->default_lang = $obj->default_lang;
                 $this->logo = $obj->logo;
 
+                $this->webservices_url = $obj->webservices_url;
+                $this->webservices_key = $obj->webservices_key;
+
                 $this->outstanding_limit		= $obj->outstanding_limit;
 
                 // multiprix
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a0b9bda1c8e..8117de5f09b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -119,7 +119,7 @@ if (empty($reshook))
     	$res=$object->setValueFrom('localtax2_value', $value);
     }
 
-    // Add new third party
+    // Add new or update third party
     if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
     && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
     {
@@ -189,6 +189,10 @@ if (empty($reshook))
         $object->commercial_id         = GETPOST('commercial_id', 'int');
         $object->default_lang          = GETPOST('default_lang');
 
+        // Webservices url/key
+        $object->webservices_url       = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+        $object->webservices_key       = GETPOST('webservices_key', 'san_alpha');
+
         // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
@@ -217,6 +221,18 @@ if (empty($reshook))
                 $error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
                 $action = ($action=='add'?'create':'edit');
             }
+            if (! empty($object->webservices_url)) {
+                //Check if has transport, without any the soap client will give error
+                if (strpos($object->webservices_url, "http") === false)
+                {
+                    $object->webservices_url = "http://".$object->webservices_url;
+                }
+                if (! isValidUrl($object->webservices_url)) {
+                    $langs->load("errors");
+                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+                    $action = ($action=='add'?'create':'edit');
+                }
+            }
 
             // We set country_id, country_code and country for the selected country
             $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
@@ -1179,6 +1195,10 @@ else
                 $object->tva_intra				= GETPOST('tva_intra', 'alpha');
                 $object->status					= GETPOST('status', 'int');
 
+                // Webservices url/key
+                $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+                $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
+
                 //Local Taxes
                 $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
                 $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
@@ -1558,6 +1578,14 @@ else
             	print $object->showOptionals($extrafields,'edit');
             }
 
+            // Webservices url/key
+            if (!empty($conf->syncsupplierwebservices->enabled)) {
+                print '<tr><td><label for="webservices_url">'.$langs->trans('WebServiceURL').'</label></td>';
+                print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
+                print '<td><label for="webservices_key">'.$langs->trans('WebServiceKey').'</label></td>';
+                print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
+            }
+
             // Logo
             print '<tr class="hideonsmartphone">';
             print '<td><label for="photoinput">'.$langs->trans("Logo").'</label></td>';
@@ -2014,6 +2042,12 @@ else
             print "</tr>\n";
         }
 
+        // Webservices url/key
+        if (!empty($conf->syncsupplierwebservices->enabled)) {
+            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+        }
+
         print '</table>';
 
         dol_fiche_end();

From b8faed9fe80700c2be56ca3f7469277cf9a41352 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Nov 2014 19:50:56 +0100
Subject: [PATCH 5/9] Fix: translation

---
 htdocs/langs/en_US/admin.lang   |  4 ++--
 htdocs/langs/en_US/holiday.lang | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 59b31693b2b..82a80881fd0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -514,8 +514,8 @@ Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
 Module39000Desc=Batch number, eat-by and sell-by date management on products
 Module50000Name=PayBox
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index c25abf6449c..698d34eb539 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -52,16 +52,16 @@ UpdateButtonCP=Update
 CantUpdate=You cannot update this leave request.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
 ConfirmValidCP=Are you sure you want to approve the leave request?
 DateValidCP=Date approved
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
 ConfirmRefuseCP=Are you sure you want to refuse the leave request?
 NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
 ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Reason for refusal
 DateRefusCP=Date of refusal
@@ -78,7 +78,7 @@ ActionByCP=Performed by
 UserUpdateCP=For the user
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Name
 Employee=Employee
 FirstDayOfHoliday=First day of vacation
@@ -88,25 +88,25 @@ ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
 DescOptionCP=Description of the option
 ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Updated successfully.
 ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
 AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
 AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
 nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
 TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events

From 762eb1cd48ad07ee4512391f2ac3cc551ad41aed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Nov 2014 20:04:01 +0100
Subject: [PATCH 6/9] Style were lost

---
 htdocs/langs/en_US/admin.lang        |   4 ++--
 htdocs/theme/eldy/img/background.png | Bin 0 -> 25628 bytes
 htdocs/theme/eldy/style.css.php      |  31 ++++++++++++++++-----------
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/background.png

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 82a80881fd0..00f7ae43737 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -522,8 +522,8 @@ Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
 Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
diff --git a/htdocs/theme/eldy/img/background.png b/htdocs/theme/eldy/img/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb63f12299c1e94af1bdccaf930065b210b834dc
GIT binary patch
literal 25628
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
U`K5o~IsRvV)%gm>_U@Da1L(<jvH$=8

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 90826327b59..b8467076f40 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -223,7 +223,6 @@ body {
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: <?php print $colorbackbody; ?>;
-	/* background-image: url("<?php print DOL_URL_ROOT.'/theme/eldy/img/background.png'; ?>"); */
 <?php } ?>
 	color: #101010;
 	font-size: <?php print $fontsize ?>px;
@@ -831,10 +830,10 @@ foreach($mainmenuusedarray as $val)
 
 .bodylogin
 {
-	background: #f0f0f0;
-	/*-moz-box-shadow:    inset 0 0 10px #000000;
+	background: #fbfbfb;
+	/* -moz-box-shadow:    inset 0 0 10px #000000;
    	-webkit-box-shadow: inset 0 0 10px #000000;
-   	box-shadow:         inset 0 0 10px #000000;*/
+   	box-shadow:         inset 0 0 10px #000000; */
 }
 .login_vertical_align {
 	padding: 10px;
@@ -861,17 +860,23 @@ form#login {
 	padding-top:12px;
 	padding-bottom:12px;
 	max-width: 540px;
-	border: 1px solid #A0A0A0;
+
+	border: 1px solid #C0C0C0;
+	background-color: #E0E0E0;
+
+    -moz-box-shadow: 3px 2px 20px #CCC;
+    -webkit-box-shadow: 3px 2px 20px #CCC;
+    box-shadow: 3px 2px 20px #CCC;
 
 	border-radius: 8px;
-	border:solid 1px rgba(90,90,90,.4);
-	-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-	-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-	box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-
-	background-color: #FFFFFF;
-	background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8));
-    background: -moz-linear-gradient(top, #fff, #f8f8f8);
+	border:solid 1px rgba(128,128,128,.4);
+	border-top:solid 1px f8f8f8;
+	background-color: #f8f8f8;
+	background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+	background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
 }
 div#login_left, div#login_right {
 	display: inline-block;

From 167ec6917a30e8362860229d49d974a1eed746f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Nov 2014 20:15:51 +0100
Subject: [PATCH 7/9] Can add prefix into generated filename. This will save
 time for script to build kit of files for book keeper.

---
 htdocs/core/lib/invoice2.lib.php       | 18 ++++++------------
 scripts/invoices/rebuild_merge_pdf.php | 11 ++++++++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index d5be39aff0f..ccc115b5b1d 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -41,12 +41,13 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  * @param 	date		$paymentdatebefore		Payment before date (must includes hour)
  * @param	int			$usestdout				Add information onto standard output
  * @param	int			$regenerate				''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template
- * @param	string		$option					Suffix to add into file name of generated PDF
+ * @param	string		$filesuffix				Suffix to add into file name of generated PDF
  * @param	string		$paymentbankid			Only if payment on this bank account id
  * @param	array		$thirdpartiesid			List of thirdparties id when using filter excludethirdpartiesid	or onlythirdpartiesid
+ * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
-function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $option='', $paymentbankid='', $thirdpartiesid='')
+function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
 {
 	$sql = "SELECT DISTINCT f.rowid, f.facnumber";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -220,13 +221,6 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 			//$pdf->SetCompression(false);
 
-
-			//$pdf->Open();
-			//$pdf->AddPage();
-			//$title=$langs->trans("BillsCustomersUnpaid");
-			//if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid");
-			//$pdf->MultiCell(100, 3, $title, 0, 'J');
-
 			// Add all others
 			foreach($files as $file)
 			{
@@ -248,9 +242,9 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			dol_mkdir($diroutputpdf);
 
 			// Save merged file
-			$filename='mergedpdf';
-
-			if (! empty($option)) $filename.='_'.$option;
+			$filename=$fileprefix;
+			if (empty($filename)) $filename='mergedpdf';
+			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
 			$file=$diroutputpdf.'/'.$filename.'.pdf';
 
 			if (! $error && $pagecount)
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 357a09ccdbe..6fbcdb59538 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -71,6 +71,7 @@ $newlangid='en_EN';	// To force a new lang id
 $filter=array();
 $regenerate='';		// Ask regenerate (contains name of model to use)
 $option='';
+$fileprefix='mergedpdf';
 
 foreach ($argv as $key => $value)
 {
@@ -84,6 +85,13 @@ foreach ($argv as $key => $value)
 		$newlangid=$valarray[1];
 		print 'Use language '.$newlangid.".\n";
 	}
+	if (preg_match('/^prefix=/i',$value))
+	{
+		$found=true;
+		$valarray=explode('=',$value);
+		$fileprefix=$valarray[1];
+		print 'Use prefix for filename '.$fileprefix.".\n";
+	}
 
 	if (preg_match('/^regenerate=(.*)/i',$value,$reg))
 	{
@@ -232,7 +240,7 @@ if (in_array('bank',$filter) && in_array('nopayment',$filter))
 
 // Define SQL and SQL request to select invoices
 // Use $filter, $dateafterdate, datebeforedate, $paymentdateafter, $paymentdatebefore
-$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid);
+$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid, $fileprefix);
 
 
 
@@ -283,6 +291,7 @@ function usage()
     print "To limit to some thirdparties, use filter=onlythirdparties id1,id2...\n";
     print "To regenerate existing PDF, use regenerate=crabe\n";
     print "To generate invoices in a language, use lang=xx_XX\n";
+    print "To set prefix of generated file name, use prefix=myfileprefix\n";
     print "\n";
 	print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
 	print "Example: ".$script_file." filter=all lang=en_US\n";

From b74bdb8f7d08bf192b129b514145cfdc48ca19f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Nov 2014 11:39:30 +0100
Subject: [PATCH 8/9] Fix: Bad error message

---
 htdocs/commande/card.php          | 14 +++-----------
 htdocs/compta/facture.php         | 18 ++++++------------
 htdocs/core/lib/functions.lib.php |  6 +++++-
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 47dfb568c78..d575c8089f0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1295,18 +1295,10 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 					setEventMessage($mesg, 'errors');
 				}
 			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-			$action='presend';
-			dol_syslog('Recipient email is empty');
-			}*/
 		} else {
-			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
-			dol_syslog('Failed to read file: ' . $file);
+			$langs->load("other");
+			setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
+			dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
 		}
 	} else {
 		$langs->load("other");
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 58001d5c918..8e618663237 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1615,8 +1615,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				$sendtoid = $_POST['receiver'];
 			}
 		}
-
-		if (dol_strlen($sendto)) {
+		
+		if (dol_strlen($sendto)) 
+		{
 			$langs->load("commercial");
 
 			$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
@@ -1715,17 +1716,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					setEventMessage($mesg, 'errors');
 				}
 			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
-			dol_syslog('Recipient email is empty');
-			}*/
 		} else {
-			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
-			dol_syslog('Failed to read file: ' . $file);
+			$langs->load("other");
+			setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
+			dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
 		}
 	} else {
 		$langs->load("other");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 23092acfd0d..a94a77f1454 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2862,7 +2862,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 
 		$listofcurrenciesbefore=array('USD');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
-		else $cursymbolafter.=$outlangs->getCurrencySymbol($currency_code);
+		else 
+		{
+			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
+			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
+		}
 	}
 	$output=$cursymbolbefore.$output.$end.$cursymbolafter;
 

From 5086450f35176f392485ea4739ccf8ebae50e162 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Nov 2014 12:32:38 +0100
Subject: [PATCH 9/9] Fix: Forging email content must use dol_concatdesc.

---
 htdocs/comm/propal.php                        |  9 +++---
 htdocs/commande/card.php                      |  9 +++---
 htdocs/compta/facture.php                     | 32 ++++++-------------
 htdocs/compta/facture/impayees.php            |  9 +++---
 htdocs/core/actions_sendmails.inc.php         | 11 ++++---
 htdocs/core/class/interfaces.class.php        |  3 +-
 .../core/triggers/dolibarrtriggers.class.php  |  3 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |  2 +-
 htdocs/expedition/card.php                    |  9 +++---
 htdocs/fichinter/card.php                     |  9 +++---
 htdocs/fourn/commande/card.php                |  9 +++---
 htdocs/fourn/facture/card.php                 |  9 +++---
 12 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 6281b1f25f4..189f1f9c041 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -617,11 +617,12 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			else
 				$subject = $langs->transnoentities('Propal') . ' ' . $object->ref;
 			$actiontypecode = 'AC_PROP';
-			$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
+			$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
 			if ($message) {
-				$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-				$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-				$actionmsg .= $message;
+				if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+				$actionmsg = dol_concatdesc($actionmsg, $message);
 			}
 			$actionmsg2 = $langs->transnoentities('Action' . $actiontypecode);
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d575c8089f0..792da64a923 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1225,11 +1225,12 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 				else
 					$subject = $langs->transnoentities('Order') . ' ' . $object->ref;
 				$actiontypecode = 'AC_COM';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
+				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
 				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
+					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+					$actionmsg = dol_concatdesc($actionmsg, $message);
 				}
 				$actionmsg2 = $langs->transnoentities('Action' . $actiontypecode);
 			}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8e618663237..2ba425f5a90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1627,31 +1627,19 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO);
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
-			if ($action == 'send') {
+			if ($action == 'send' || $action == 'relance') 
+			{
 				if (dol_strlen($_POST['subject']))
 					$subject = $_POST['subject'];
 				else
 					$subject = $langs->transnoentities('Bill') . ' ' . $object->ref;
 				$actiontypecode = 'AC_FAC';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
+				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
 				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
-				}
-				// $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-			}
-			if ($action == 'relance') {
-				if (dol_strlen($_POST['subject']))
-					$subject = $_POST['subject'];
-				else
-					$subject = $langs->transnoentities('Relance facture ' . $object->ref);
-				$actiontypecode = 'AC_FAC';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
-				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
+					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+					$actionmsg = dol_concatdesc($actionmsg, $message);
 				}
 				// $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
 			}
@@ -1661,9 +1649,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$formmail = new FormMail($db);
 
 			$attachedfiles = $formmail->get_attached_files();
-			$filepath = $attachedfiles ['paths'];
-			$filename = $attachedfiles ['names'];
-			$mimetype = $attachedfiles ['mimes'];
+			$filepath = $attachedfiles['paths'];
+			$filename = $attachedfiles['names'];
+			$mimetype = $attachedfiles['mimes'];
 
 			// Send mail
 			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index ea0d896f5d1..320d86f3377 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -136,12 +136,13 @@ if ($action == 'presend' && GETPOST('sendmail'))
 						$message=make_substitutions($message, $substitutionarray);
 
 						$actiontypecode='AC_FAC';
-						$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+						$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 						if ($message)
 						{
-							$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-							$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-							$actionmsg.=$message;
+							if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+							$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+							$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+							$actionmsg = dol_concatdesc($actionmsg, $message);
 						}
 
 						// Create form object
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 337cf59c9b0..625376ace58 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -126,13 +126,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			if ($action == 'send' || $action == 'relance')
 			{
 				if (dol_strlen($_POST['subject'])) $subject = $_POST['subject'];
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+				$actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 				if ($message)
 				{
-					$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-					$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-					$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-					$actionmsg.=$message;
+					$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+					$actionmsg = dol_concatdesc($actionmsg, $message);
 				}
 			}
 
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 407893021ef..199c342020d 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -31,7 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class Interfaces
 {
-    var $dir;				// Directory with all core and external triggers files
+    var $db;
+	var $dir;				// Directory with all core and external triggers files
     var $errors	= array();	// Array for errors
 
     /**
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index 1fd29359d74..0682bb76a71 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -83,7 +83,8 @@ abstract class DolibarrTriggers
 
 		$this->db = $db;
 
-		if (!isset($this->name)) {
+		if (empty($this->name)) 
+		{
 			$this->name = preg_replace('/^Interface/i', '', get_class($this));
 		}
 	}
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 632acf71b0e..d4fe47c0faa 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -222,7 +222,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
                 $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
                 $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
-
+            
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
 		}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 7db0ecc56b1..8984e4c5424 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -462,12 +462,13 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile'
                     if (dol_strlen(GETPOST('subject','alpha'))) $subject=GETPOST('subject','alpha');
                     else $subject = $langs->transnoentities('Shipping').' '.$object->ref;
                     $actiontypecode='AC_SHIP';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                     if ($message)
                     {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
+						if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+						$actionmsg = dol_concatdesc($actionmsg, $message);
                     }
                     $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
                 }
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index b5e874d03a6..77c7e17ffb5 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -745,12 +745,13 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
 			if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
 			else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
 			$actiontypecode='AC_OTH_AUTO';
-			$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+			$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 			if ($message)
 			{
-				$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-				$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-				$actionmsg.=$message;
+				if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+				$actionmsg = dol_concatdesc($actionmsg, $message);
 			}
 			$actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
 		}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 4ae8fb17754..0273dea94b9 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -944,12 +944,13 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
                     if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject');
                     else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
                     $actiontypecode='AC_SUP_ORD';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                     if ($message)
                     {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
+						if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+						$actionmsg = dol_concatdesc($actionmsg, $message);
                     }
                     $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
                 }
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e88b5a37945..b88fd582400 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -903,12 +903,13 @@ 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_INV';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                     if ($message)
                     {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
+						if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+						$actionmsg = dol_concatdesc($actionmsg, $message);
                     }
                     $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
                 }