From 3a053e3fedd5bb3b7668d128750461a6adc8b4ed Mon Sep 17 00:00:00 2001
From: Gregory DAVID <groolot@groolot.net>
Date: Fri, 7 Feb 2014 18:08:25 +0100
Subject: [PATCH 01/77] =?UTF-8?q?Donne=20la=20possibilit=C3=A9=20de=20fair?=
 =?UTF-8?q?e=20un=20filtrage=20sur=20les=20agenda=20en=20fonction=20du=20n?=
 =?UTF-8?q?um=C3=A9ro=20de=20projet=20pass=C3=A9=20en=20GET=20:=20&project?=
 =?UTF-8?q?=3DXX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/action/class/actioncomm.class.php | 1 +
 htdocs/public/agenda/agendaexport.php         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 10082062d06..9f1a5cdfeff 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -893,6 +893,7 @@ class ActionComm extends CommonObject
                 if ($key == 'id')           $sql.=" AND a.id=".(is_numeric($value)?$value:0);
                 if ($key == 'idfrom')       $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
                 if ($key == 'idto')         $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
+                if ($key == 'project')      $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
                 if ($key == 'login')
                 {
                     $login=$value;
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index efc4f132764..63889f89385 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -65,6 +65,7 @@ if (! empty($_GET["year"])) 	$filters['year']=$_GET["year"];
 if (! empty($_GET["id"]))       $filters['id']=$_GET["id"];
 if (! empty($_GET["idfrom"]))   $filters['idfrom']=$_GET["idfrom"];
 if (! empty($_GET["idto"]))     $filters['idto']=$_GET["idto"];
+if (! empty($_GET["project"]))  $filters['project']=$_GET["project"];
 if (! empty($_GET["login"]))    $filters['login']=$_GET["login"];
 if (! empty($_GET["logina"]))   $filters['logina']=$_GET["logina"];
 if (! empty($_GET["logint"]))   $filters['logint']=$_GET["logint"];
@@ -107,6 +108,7 @@ foreach ($filters as $key => $value)
     if ($key == 'id')              $filename.='-id'.$value;
     if ($key == 'idfrom')          $filename.='-idfrom'.$value;
     if ($key == 'idto')            $filename.='-idto'.$value;
+    if ($key == 'project')         $filename.='-project'.$value;
     if ($key == 'login')	       $filename.='-login'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logind')	       $filename.='-logind'.$value;	// Affected to

From bc669f1702cf9b6efb3a04cdd3e37520f2d0900c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 9 Oct 2014 13:54:52 +0200
Subject: [PATCH 02/77] Merge

---
 htdocs/categories/viewcat.php | 82 +++++++++++++++++------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 14a63ffc837..c55f324ab06 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -38,7 +38,7 @@ $type=GETPOST('type');
 $action=GETPOST('action');
 $confirm=GETPOST('confirm');
 $removeelem = GETPOST('removeelem','int');
-$elemid=GETPOST('elemid');
+$elemid=GETPOST('elemid');
 
 if ($id == "")
 {
@@ -121,32 +121,32 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	}
 }
 
-if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer))
+if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer))
 {
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-	$newobject = new Product($db);
-	$result = $newobject->fetch($elemid);
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+	$newobject = new Product($db);
+	$result = $newobject->fetch($elemid);
 	$elementtype = 'product';
 	
 	// TODO Add into categ
-	$result=$object->add_type($newobject,$elementtype);
-	if ($result >= 0)
-	{
-		setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref));
-	}
-	else
-	{
-		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings');
-		}
-		else
-		{
-			setEventMessages($object->error,$object->errors,'errors');
-		}
-	}
-	
-}
+	$result=$object->add_type($newobject,$elementtype);
+	if ($result >= 0)
+	{
+		setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref));
+	}
+	else
+	{
+		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		{
+			setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings');
+		}
+		else
+		{
+			setEventMessages($object->error,$object->errors,'errors');
+		}
+	}
+	
+}
 
 
 
@@ -292,26 +292,26 @@ if ($object->type == 0)
 	{
 		$showclassifyform=1; $typeid=0;
 		
-		// Form to add record into a category
-		if ($showclassifyform)
-		{
+		// Form to add record into a category
+		if ($showclassifyform)
+		{
 			print '<br>';
-			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-			print '<input type="hidden" name="type" value="'.$typeid.'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td width="40%">';
-			print $langs->trans("AddProductServiceIntoCategory").' &nbsp;';
-			print $form->select_produits('','elemid','',0,0,-1,2,'',1);
-			print '</td><td>';
-			print '<input type="submit" class="button" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre"><td width="40%">';
+			print $langs->trans("AddProductServiceIntoCategory").' &nbsp;';
+			print $form->select_produits('','elemid','',0,0,-1,2,'',1);
+			print '</td><td>';
+			print '<input type="submit" class="button" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
 		
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";

From 96aee6eed4926ee4dfc00f4250587d47014d9a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:48:59 +0200
Subject: [PATCH 03/77] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4bc6da083aa..2f9732a0876 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -460,21 +460,18 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
 }
 
 /**
- *  On/off button for product tosell or tobuy
+ *  On/off button for object
  *
- *  @param  int     $id         Id product to set
- *  @param  string  $code       Name of constant : status or status_buy
+ *  @param  int     $object     Object to set
+ *  @param  string  $code       Name of constant : status or status_buy for product by example
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_productonoff($id, $code, $input=array())
+function ajax_object_onoff($object, $code, $input=array())
 {
     require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
     global $conf, $langs, $db;
 
-    $object = new Product($db);
-    $object->fetch($id);
-
     $out= '<script type="text/javascript">
         $(function() {
             var input = '.json_encode($input).';
@@ -484,7 +481,7 @@ function ajax_productonoff($id, $code, $input=array())
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
-                    id: \''.$id.'\'
+                    id: \''.$object->id.'\'
                 },
                 function() {
                     $("#set_'.$code.'").hide();
@@ -512,7 +509,7 @@ function ajax_productonoff($id, $code, $input=array())
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
-                    id: \''.$id.'\'
+                    id: \''.$object->id.'\'
                 },
                 function() {
                     $("#del_'.$code.'").hide();

From 98db599c69baee91da2f766cf36d0093a5892987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:51:05 +0200
Subject: [PATCH 04/77] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5644e41df1c..914ef4c7d8e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object->id, 'status');
+                print ajax_productonoff($object, 'status');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object->id, 'status_buy');
+                print ajax_productonoff($object, 'status_buy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 3a49965820138a7ff59fe5f7ecf2f1f819c6c137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:52:37 +0200
Subject: [PATCH 05/77] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ae8afe696bc..4938ec3e033 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_productonoff($product->id, 'status');
+            print ajax_object_onoff($product, 'status');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_productonoff($product->id, 'status_buy');
+            print ajax_object_onoff($product, 'status_buy');
         } else {
             print $product->getLibStatut(2,1);
         }

From b80b45c086da9efcc324afdb884a2291a3ea2a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:55:10 +0200
Subject: [PATCH 06/77] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 914ef4c7d8e..cd75ab3e2bb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object, 'status');
+                print ajax_object_onoff($object, 'status');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object, 'status_buy');
+                print ajax_object_onoff($object, 'status_buy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 2107a61bbefbe0f1f82cb4820febf809ebf14dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 16:32:32 +0200
Subject: [PATCH 07/77] Update ajax.lib.php

For use in a list of object
---
 htdocs/core/lib/ajax.lib.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 2f9732a0876..46442460feb 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -477,15 +477,15 @@ function ajax_object_onoff($object, $code, $input=array())
             var input = '.json_encode($input).';
 
             // Set constant
-            $("#set_'.$code.'").click(function() {
+            $("#set_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
                     id: \''.$object->id.'\'
                 },
                 function() {
-                    $("#set_'.$code.'").hide();
-                    $("#del_'.$code.'").show();
+                    $("#set_'.$code.'_'.$object->id.'").hide();
+                    $("#del_'.$code.'_'.$object->id.'").show();
                     // Enable another element
                     if (input.disabled && input.disabled.length > 0) {
                         $.each(input.disabled, function(key,value) {
@@ -505,15 +505,15 @@ function ajax_object_onoff($object, $code, $input=array())
             });
 
             // Del constant
-            $("#del_'.$code.'").click(function() {
+            $("#del_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
                     id: \''.$object->id.'\'
                 },
                 function() {
-                    $("#del_'.$code.'").hide();
-                    $("#set_'.$code.'").show();
+                    $("#del_'.$code.'_'.$object->id.'").hide();
+                    $("#set_'.$code.'_'.$object->id.'").show();
                     // Disable another element
                     if (input.disabled && input.disabled.length > 0) {
                         $.each(input.disabled, function(key,value) {
@@ -534,12 +534,12 @@ function ajax_object_onoff($object, $code, $input=array())
         });
     </script>';
     if ($code=='status') {
-        $out.= '<span id="set_'.$code.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
-        $out.= '<span id="del_'.$code.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
+        $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
+        $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
     }
     if ($code=='status_buy') {
-    $out.= '<span id="set_'.$code.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
-    $out.= '<span id="del_'.$code.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
+    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
+    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
     }
     return $out;
 }

From 830ec9c9cb2f9d5684ac5f0cc7d6ec06e6ef3d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 16:36:28 +0200
Subject: [PATCH 08/77] Update list.php

---
 htdocs/product/list.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index ebcd3245e7d..7e817d69725 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -507,11 +507,25 @@ else
     				}
     			}
 
-    			// Status (to buy)
-    			print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tosell,5,0).'</td>';
-
+                $product_static->status_buy = $objp->tobuy;
+                $product_static->status     = $objp->tosell;
                 // Status (to sell)
-                print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>';
+                print '<td align="right" nowrap="nowrap">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($product_static, 'status');
+                } else {
+                    print $product_static->LibStatut($objp->tosell,5,0);
+                }
+                print '</td>';
+
+                // Status (to buy)
+                print '<td align="right" nowrap="nowrap">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($product_static, 'status_buy');
+                } else {
+                    print $product_static->LibStatut($objp->tobuy,5,1);
+                }
+                print '</td>';
 
                 print '<td>&nbsp;</td>';
 

From a7941805861434e9af68889c175d70e621693164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20DAVID?= <groolot@groolot.net>
Date: Sat, 18 Oct 2014 16:41:47 +0200
Subject: [PATCH 09/77] Document the ability to export agenda calendar
 restricted to project ID

---
 htdocs/admin/agenda_xcal.php   | 3 ++-
 htdocs/langs/en_US/agenda.lang | 1 +
 htdocs/langs/fr_FR/agenda.lang | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 135429e15d3..4e9005a27de 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -174,7 +174,8 @@ $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login);
+$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
 print info_admin($message);
 
 if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 187f818210e..b777ed2838a 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -65,6 +65,7 @@ AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assi
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
 AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 190c08ad2ac..766b5aca829 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -65,6 +65,7 @@ AgendaUrlOptions2=<b>login=%s</b> pour limiter l'export aux actions créées, af
 AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions créées par l'utilisateur <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> pour limiter l'export aux actions affectées à l'utilisateur <b>%s</b>.
 AgendaUrlOptions5=<b>logind=%s</b> pour limiter l'export aux actions réalisées par l'utilisateur <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pour limiter l'export aux actions associées au projet dont l'identifiant est <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Afficher l'anniversaire des contacts
 AgendaHideBirthdayEvents=Cacher l'anniversaire des contacts
 Busy=Occupé

From dd5ea670e2e5bdb30dd0b7bab7df181ef8620abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:11:02 +0200
Subject: [PATCH 10/77] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 46442460feb..0057f976a75 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -469,7 +469,6 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  */
 function ajax_object_onoff($object, $code, $input=array())
 {
-    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
     global $conf, $langs, $db;
 
     $out= '<script type="text/javascript">
@@ -478,7 +477,7 @@ function ajax_object_onoff($object, $code, $input=array())
 
             // Set constant
             $("#set_'.$code.'_'.$object->id.'").click(function() {
-                $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
                     id: \''.$object->id.'\'
@@ -506,7 +505,7 @@ function ajax_object_onoff($object, $code, $input=array())
 
             // Del constant
             $("#del_'.$code.'_'.$object->id.'").click(function() {
-                $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
                     id: \''.$object->id.'\'

From 489045d71570def7fb9920df95571d8d5a8a74f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:11:47 +0200
Subject: [PATCH 11/77] Rename productonoff.php to objectonoff.php

---
 htdocs/core/ajax/{productonoff.php => objectonoff.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/core/ajax/{productonoff.php => objectonoff.php} (100%)

diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/objectonoff.php
similarity index 100%
rename from htdocs/core/ajax/productonoff.php
rename to htdocs/core/ajax/objectonoff.php

From 8bb0ce0f7fc106f2bfd912c4f4912ee4b983461e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:17:41 +0200
Subject: [PATCH 12/77] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 0057f976a75..6c24b1eac6f 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -469,7 +469,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  */
 function ajax_object_onoff($object, $code, $input=array())
 {
-    global $conf, $langs, $db;
+    global $langs;
 
     $out= '<script type="text/javascript">
         $(function() {

From eefb211be797f15e1addc70d5c5abdb39a652f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:48:13 +0200
Subject: [PATCH 13/77] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 6c24b1eac6f..84e1a536465 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -464,10 +464,12 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  *
  *  @param  int     $object     Object to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
+ *  @param  string  $text_on    Text if on
+ *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_object_onoff($object, $code, $input=array())
+function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
 {
     global $langs;
 
@@ -532,14 +534,9 @@ function ajax_object_onoff($object, $code, $input=array())
             });
         });
     </script>';
-    if ($code=='status') {
-        $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
-        $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
-    }
-    if ($code=='status_buy') {
-    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
-    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
-    }
+    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans($text_off),'switch_off').'</span>';
+    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans($text_on),'switch_on').'</span>';
+
     return $out;
 }
 

From 446e73d8b80e5b977d484d2a70c5ebda5f9ff600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:49:47 +0200
Subject: [PATCH 14/77] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index cd75ab3e2bb..eadb701e4a8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status');
+                print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status_buy');
+                print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 3ab8e13157008752c5a8c3a87ab01e2da3c8baba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:51:25 +0200
Subject: [PATCH 15/77] Update list.php

---
 htdocs/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7e817d69725..e77115eb72f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -512,7 +512,7 @@ else
                 // Status (to sell)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status');
+                    print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
                 } else {
                     print $product_static->LibStatut($objp->tosell,5,0);
                 }
@@ -521,7 +521,7 @@ else
                 // Status (to buy)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status_buy');
+                    print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
                 } else {
                     print $product_static->LibStatut($objp->tobuy,5,1);
                 }

From 3144fd6845a8e3b0d36759b2459babf9dcd66322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:52:16 +0200
Subject: [PATCH 16/77] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 4938ec3e033..dd507883674 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status');
+            print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status_buy');
+            print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
         } else {
             print $product->getLibStatut(2,1);
         }

From a1bedcc26351f0e8da140cf0ec16de7b4cb41a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:46:13 +0200
Subject: [PATCH 17/77] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 84e1a536465..709911faaec 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -462,14 +462,15 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
 /**
  *  On/off button for object
  *
- *  @param  int     $object     Object to set
+ *  @param  int     $object     Id product to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
+ *  @param  string  $field      Name of database field : tosell or tobuy for product by example
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array())
 {
     global $langs;
 
@@ -480,8 +481,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
             // Set constant
             $("#set_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
-                    action: \'set'.$code.'\',
+                    action: \'set\',
+                    field: \''.$field.'\',
                     value: \'1\',
+                    element: \''.$object->element.'\',
                     id: \''.$object->id.'\'
                 },
                 function() {
@@ -508,8 +511,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
             // Del constant
             $("#del_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
-                    action: \'set'.$code.'\',
+                    action: \'set\',
+                    field: \''.$field.'\',
                     value: \'0\',
+                    element: \''.$object->element.'\',
                     id: \''.$object->id.'\'
                 },
                 function() {

From 5b9a134d6970cdbe476d581de952ebbc78160651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:47:12 +0200
Subject: [PATCH 18/77] Update objectonoff.php

---
 htdocs/core/ajax/objectonoff.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 05eebc7a65f..6ac5abd3bbb 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -32,9 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 $action=GETPOST('action','alpha');
 $id=GETPOST('id', 'int');
 $value=GETPOST('value', 'int');
+$field=GETPOST('field', 'alpha');
+$element=GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
-
 /*
  * View
  */
@@ -44,9 +45,5 @@ top_httphead();
 print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
 // Registering new values
-if (! empty($action) && ! empty($id) && $user->rights->produit->creer) {
-    if ($action == 'setstatus') 
-        $object->setValueFrom('tosell', $value, 'product', $id);
-    else if ($action == 'setstatus_buy') 
-        $object->setValueFrom('tobuy', $value, 'product', $id);
-}
+if (($action == 'set') && ! empty($id))
+    $object->setValueFrom($field, $value, $element, $id);

From 5e946d646659e20d005aa8e6b4c35320f9f88a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:49:07 +0200
Subject: [PATCH 19/77] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index eadb701e4a8..889c782808b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+                print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+                print ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 8133b67878ed7067b7af91ca5bba1c0d4f6741de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:50:17 +0200
Subject: [PATCH 20/77] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index dd507883674..7885553095e 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+            print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+            print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
         } else {
             print $product->getLibStatut(2,1);
         }

From 761fc32cc1123cc11d8a24363ab3eaf4ca370741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:51:24 +0200
Subject: [PATCH 21/77] Update list.php

---
 htdocs/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e77115eb72f..76049fd1ef3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -512,7 +512,7 @@ else
                 // Status (to sell)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+                    print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
                 } else {
                     print $product_static->LibStatut($objp->tosell,5,0);
                 }
@@ -521,7 +521,7 @@ else
                 // Status (to buy)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+                    print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
                 } else {
                     print $product_static->LibStatut($objp->tobuy,5,1);
                 }

From a14d07930a2f9acbf635e2008af0896d0e38ec07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:52:54 +0200
Subject: [PATCH 22/77] Update soc.php

---
 htdocs/societe/soc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a0b9bda1c8e..b49a1678b00 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1698,7 +1698,11 @@ else
         // Status
         print '<tr><td>'.$langs->trans("Status").'</td>';
         print '<td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
-        print $object->getLibStatut(2);
+        if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer) {
+            print ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+        } else {
+            print $object->getLibStatut(2);
+        }
         print '</td>';
         print $htmllogobar; $htmllogobar='';
         print '</tr>';

From 1eba744e8be7e1c307cc107860d238600ace9433 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 20 Oct 2014 13:15:48 +0200
Subject: [PATCH 23/77] Add hook method to simply display child lines in
 order/invoice/propal

---
 htdocs/core/class/commonobject.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9996337736a..e7cf4dbb7ee 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2566,6 +2566,11 @@ abstract class CommonObject
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
+				else 
+				{
+					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+					$reshook=$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				}
 			}
 			else
 			{

From c103a5927a9596cb34747556789b26d9c2854314 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Mon, 20 Oct 2014 22:28:08 +0200
Subject: [PATCH 24/77] Update commondocgenerator.class.php

add : outstanding limit on ODT
fix  : only public note are display on ODT (private stay private)
---
 htdocs/core/class/commondocgenerator.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index a16b0cb16b6..d1048acbc23 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -118,8 +118,9 @@ abstract class CommonDocGenerator
             'mycompany_idprof5'=>$mysoc->idprof5,
             'mycompany_idprof6'=>$mysoc->idprof6,
         	'mycompany_vatnumber'=>$mysoc->tva_intra,
+        	'outstanding_limit'=>$mysoc->outstanding_limit,
             // Only private not exists for "mysoc"
-        	'mycompany_note'=>$mysoc->note_private
+        	'mycompany_note'=>$mysoc->note_public
             //'mycompany_note_private'=>$mysoc->note_private,
         	//'mycompany_note_public'=>$mysoc->note_public,
         );

From ba9d2c3690e4c5f65fc3ca35f9930200ea15ac46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 11:02:16 +0200
Subject: [PATCH 25/77] Update card.php

---
 htdocs/product/card.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 889c782808b..9f2f0685beb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1436,12 +1436,16 @@ else
             }
             print '</td></tr>';
 
-			// Batch number management (to batch)
-			if ($conf->productbatch->enabled) {
-				print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
-				print $object->getLibStatut(2,2);
-				print '</td></tr>';
-			}
+            // Batch number management (to batch)
+            if ($conf->productbatch->enabled) {
+                print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
+                } else {
+                    print $object->getLibStatut(2,2);
+                }
+                print '</td></tr>';
+            }
 
             // Description
             print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';

From 19e194dd814aad0c4eb2d36074305f022f8d28d1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 23 Oct 2014 12:01:15 +0200
Subject: [PATCH 26/77] encrease name length for societe

---
 htdocs/install/mysql/tables/llx_adherent.sql | 2 +-
 htdocs/install/mysql/tables/llx_societe.sql  | 2 +-
 htdocs/societe/soc.php                       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 9e4db2b604a..e7f9c246834 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -37,7 +37,7 @@ create table llx_adherent
   pass             varchar(50),          -- password
   fk_adherent_type integer NOT NULL,
   morphy           varchar(3) NOT NULL, -- personne morale / personne physique
-  societe          varchar(60),			-- company name (should be same lenght than societe.name)
+  societe          varchar(128),			-- company name (should be same lenght than societe.name)
   fk_soc           integer NULL,		-- Link to third party linked to member
   address          text,
   zip              varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index bfe69b0d5f8..25629424037 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -22,7 +22,7 @@
 create table llx_societe
 (
   rowid                    integer AUTO_INCREMENT PRIMARY KEY,
-  nom                      varchar(60),                                -- company reference name (should be smae length than adherent.societe)
+  nom                      varchar(128),                                -- company reference name (should be same length than adherent.societe)
   entity                   integer DEFAULT 1 NOT NULL,               -- multi company id
 
   ref_ext                  varchar(128),                               -- reference into an external system (not used by dolibarr)
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a0b9bda1c8e..65b1e4783d8 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -805,7 +805,7 @@ else
 			print '<span span id="TypeName" class="fieldrequired"><label for="name">'.$langs->trans('ThirdPartyName').'</label></span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
-	    print '<input type="text" size="30" maxlength="60" name="nom" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
+	    print '<input type="text" size="60" maxlength="128" name="nom" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
 	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	    {
 		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
@@ -816,7 +816,7 @@ else
         if ($conf->use_javascript_ajax)
         {
             print '<tr class="individualline"><td><label for="firstname">'.$langs->trans('FirstName').'</label></td>';
-	        print '<td><input type="text" size="30" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
+	        print '<td><input type="text" size="60" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
             print '<td colspan=2>&nbsp;</td></tr>';
             print '<tr class="individualline"><td><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td>';
             print $formcompany->select_civility($object->civility_id).'</td>';
@@ -1266,7 +1266,7 @@ else
 
             // Name
             print '<tr><td><label for="name"><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></label></td>';
-	        print '<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
+	        print '<td colspan="3"><input type="text" size="60" maxlength="128" name="nom" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field

From 10f419e372102a7033f589c8f8c9190782f496bc Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Thu, 23 Oct 2014 13:08:39 +0200
Subject: [PATCH 27/77] error on adding fields (bad function

---
 htdocs/core/class/commondocgenerator.class.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index d1048acbc23..26f209ed107 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -118,11 +118,9 @@ abstract class CommonDocGenerator
             'mycompany_idprof5'=>$mysoc->idprof5,
             'mycompany_idprof6'=>$mysoc->idprof6,
         	'mycompany_vatnumber'=>$mysoc->tva_intra,
-        	'outstanding_limit'=>$mysoc->outstanding_limit,
-            // Only private not exists for "mysoc"
-        	'mycompany_note'=>$mysoc->note_public
-            //'mycompany_note_private'=>$mysoc->note_private,
-        	//'mycompany_note_public'=>$mysoc->note_public,
+        	// Only private not exists for "mysoc"
+            'mycompany_note_private'=>$mysoc->note_private,
+
         );
     }
 
@@ -167,6 +165,7 @@ abstract class CommonDocGenerator
             'company_customeraccountancycode'=>$object->code_compta,
             'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
             'company_juridicalstatus'=>$object->forme_juridique,
+            'company_outstanding_limit'=>$object->outstanding_limit,
             'company_capital'=>$object->capital,
             'company_idprof1'=>$object->idprof1,
             'company_idprof2'=>$object->idprof2,

From 463904706bb545349cc9a37eea9c49921618b687 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 23 Oct 2014 15:02:49 +0200
Subject: [PATCH 28/77] better display margin infos

---
 htdocs/core/class/commonobject.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9996337736a..22d3c2ffc59 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3012,13 +3012,13 @@ abstract class CommonObject
 
 		print '<table class="nobordernopadding margintable" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td width="30%">'.$langs->trans('Margins').'</td>';
-		print '<td width="20%" align="right">'.$langs->trans('SellingPrice').'</td>';
+		print '<td width="15%">'.$langs->trans('Margins').'</td>';
+		print '<td width="15%" align="right">'.$langs->trans('SellingPrice').'</td>';
 		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td width="20%" align="right">'.$langs->trans('BuyingPrice').'</td>';
+			print '<td width="15%" align="right">'.$langs->trans('BuyingPrice').'</td>';
 		else
-			print '<td width="20%" align="right">'.$langs->trans('CostPrice').'</td>';
-		print '<td width="20%" align="right">'.$langs->trans('Margin').'</td>';
+			print '<td width="15%" align="right">'.$langs->trans('CostPrice').'</td>';
+		print '<td width="15%" align="right">'.$langs->trans('Margin').'</td>';
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td align="right">'.$langs->trans('MarginRate').'</td>';
 		if (! empty($conf->global->DISPLAY_MARK_RATES))

From 36ff576d1566377785c32c66a2c6df894aa93595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 17:48:51 +0200
Subject: [PATCH 29/77] "Is Order shippable" icon

---
 htdocs/commande/list.php | 59 +++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index bd31a438b05..f7c56130c2d 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
 
 $langs->load('orders');
 $langs->load('deliveries');
@@ -325,22 +326,54 @@ if ($resql)
 	$total=0;
 	$subtotal=0;
 
-	$generic_commande = new Commande($db);
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
-		print '<td class="nowrap">';
+    $generic_commande = new Commande($db);
+    $generic_product = new Product($db);
+    while ($i < min($num,$limit)) {
+        $objp = $db->fetch_object($resql);
+        $var=!$var;
+        print '<tr '.$bc[$var].'>';
+        print '<td class="nowrap">';
 
-		$generic_commande->id=$objp->rowid;
-		$generic_commande->ref=$objp->ref;
+        $generic_commande->id=$objp->rowid;
+        $generic_commande->ref=$objp->ref;
+        $generic_commande->lines=array();
+        $generic_commande->getLinesArray();
 
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		print '<td class="nobordernopadding nowrap">';
-		print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
-		print '</td>';
+        print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+        print '<td class="nobordernopadding nowrap">';
+        print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
+        print '</td>';
 
+        // Shippable Icon
+        if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) {
+            print '<td>';
+            $shippable=0;
+            $text_info='';
+            for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) {
+                if ($generic_commande->lines[$lig]->product_type==0) {
+                    $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' : '.dol_trunc($generic_commande->lines[$lig]->product_label, 28);
+                    $generic_product->id = $generic_commande->lines[$lig]->fk_product;
+                    $generic_product->load_stock();
+                    if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) {
+                        $shippable++;
+                        $text_info.='<span style="color:#FF0000">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                    } else {
+                        $text_info.='<span style="color:#04B404">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                    }
+                }
+            }
+            if ($shippable==0) {
+                $text_icon = img_picto('', 'object_sending');
+                $text_info = $langs->trans('Shippable').'<br>'.$text_info;
+            } else {
+                $text_icon = img_picto('', 'error');
+                $text_info = $langs->trans('NonShippable').'<br>'.$text_info;
+            }
+            print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2);
+            print '</td>';
+        }
+
+        // warning late icon
 		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
 			print img_picto($langs->trans("Late"),"warning");

From 63e4275afbfc6c02f348a2e0c2503e7f166460b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 18:32:29 +0200
Subject: [PATCH 30/77] Update list.php

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f7c56130c2d..9fbe7f24c7f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -356,9 +356,9 @@ if ($resql)
                     $generic_product->load_stock();
                     if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) {
                         $shippable++;
-                        $text_info.='<span style="color:#FF0000">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                        $text_info.='<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
                     } else {
-                        $text_info.='<span style="color:#04B404">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                        $text_info.='<span class="ok>'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
                     }
                 }
             }

From 335b0b3c56a08e40739bbf164c60b205976d8f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 18:33:52 +0200
Subject: [PATCH 31/77] Update list.php

---
 htdocs/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 9fbe7f24c7f..21be169c823 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -358,7 +358,7 @@ if ($resql)
                         $shippable++;
                         $text_info.='<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
                     } else {
-                        $text_info.='<span class="ok>'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                        $text_info.='<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
                     }
                 }
             }

From 48a9be28a18f322b060eb6506293329889fd2bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 18:39:12 +0200
Subject: [PATCH 32/77] Update deliveries.lang

---
 htdocs/langs/en_US/deliveries.lang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index cabd31a3a32..b2407f610e1 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Deliverer :
 Sender=Sender
 Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Non Shippable

From ccbaba79fb12be75f9108578dd8c1b5fb9885598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 18:42:02 +0200
Subject: [PATCH 33/77] Update deliveries.lang

---
 htdocs/langs/en_US/deliveries.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index b2407f610e1..c96a506281d 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -25,4 +25,4 @@ Sender=Sender
 Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
 Shippable=Shippable
-NonShippable=Non Shippable
+NonShippable=Not Shippable

From 8b4706cacd9de06cd95a7cbcf6b57560d7d6ae5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Oct 2014 08:55:30 +0200
Subject: [PATCH 34/77] Update list.php

---
 htdocs/commande/list.php | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 21be169c823..ece12a159c1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -344,25 +344,44 @@ if ($resql)
         print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
         print '</td>';
 
-        // Shippable Icon
+        // Shipping Icon
         if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) {
             print '<td>';
-            $shippable=0;
+            $notshippable=0;
             $text_info='';
             for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) {
                 if ($generic_commande->lines[$lig]->product_type==0) {
-                    $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' : '.dol_trunc($generic_commande->lines[$lig]->product_label, 28);
                     $generic_product->id = $generic_commande->lines[$lig]->fk_product;
                     $generic_product->load_stock();
+                    // stock order and stock order_supplier
+                    $stock_order=0;
+                    $stock_order_supplier=0;
+                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                        if (! empty($conf->commande->enabled)) {
+                            $generic_product->load_stats_commande(0,'1,2');
+                            $stock_order=$generic_product->stats_commande['qty'];
+                        }
+                        if (! empty($conf->fournisseur->enabled)) {
+                            $generic_product->load_stats_commande_fournisseur(0,'3');
+                            $stock_order_supplier=$generic_product->stats_commande_fournisseur['qty'];
+                        }
+                    }
+                    $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+                    $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
                     if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) {
-                        $shippable++;
-                        $text_info.='<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                        $notshippable++;
+                        $text_info.='<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
                     } else {
-                        $text_info.='<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$generic_product->stock_reel."</span><br>";
+                        $text_info.='<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+                    }
+                    if ($stock_order_supplier>0) {
+                        $text_info.= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
+                    } else {
+                        $text_info.= '<br>';
                     }
                 }
             }
-            if ($shippable==0) {
+            if ($notshippable==0) {
                 $text_icon = img_picto('', 'object_sending');
                 $text_info = $langs->trans('Shippable').'<br>'.$text_info;
             } else {

From 6a1d5edf9d14d793499d5695c63d75ee6da38ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Oct 2014 09:23:39 +0200
Subject: [PATCH 35/77] Update list.php

---
 htdocs/commande/list.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ece12a159c1..802fe9e1f91 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -344,13 +344,14 @@ if ($resql)
         print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
         print '</td>';
 
-        // Shipping Icon
+        // Shippable Icon
         if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) {
-            print '<td>';
             $notshippable=0;
             $text_info='';
+            $nbprod=0;
             for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) {
                 if ($generic_commande->lines[$lig]->product_type==0) {
+                    $nbprod++; // order contains real products
                     $generic_product->id = $generic_commande->lines[$lig]->fk_product;
                     $generic_product->load_stock();
                     // stock order and stock order_supplier
@@ -388,8 +389,11 @@ if ($resql)
                 $text_icon = img_picto('', 'error');
                 $text_info = $langs->trans('NonShippable').'<br>'.$text_info;
             }
-            print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2);
-            print '</td>';
+            if ($nbprod>0) {
+                print '<td>';
+                print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2);
+                print '</td>';
+            }
         }
 
         // warning late icon

From 68fa6cec70b4299aa88c6dec108132b73c5f86ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 25 Oct 2014 11:34:21 +0200
Subject: [PATCH 36/77] Update commande.php

---
 htdocs/admin/commande.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index e5b2e5e6b1d..89a78b5d6da 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -222,6 +222,18 @@ else if ($action == 'set_COMMANDE_FREE_TEXT')
     }
 }
 
+//Activate Set Shippable Icon In List
+else if ($action=="setshippableiconinlist") {
+    $setshippableiconinlist = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error) {
+        setEventMessage($langs->trans("SetupSaved"));
+    } else {
+        setEventMessage($langs->trans("Error"), 'errors');
+    }
+}
+
 
 /*
  * View
@@ -548,6 +560,22 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
+// Shippable Icon in List
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
+print '<td>&nbsp</td>';
+print '<td align="center">';
+if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+} else {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+}
+print '</a></td>';
+print '</tr>';
+
 print '</table>';
 
 print '<br>';

From e08146d053f8793f7ca3dafa603f7568744ee6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 25 Oct 2014 11:37:39 +0200
Subject: [PATCH 37/77] Update list.php

---
 htdocs/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 802fe9e1f91..84f8e455d11 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -345,7 +345,7 @@ if ($resql)
         print '</td>';
 
         // Shippable Icon
-        if (($objp->fk_statut > 0) && ($objp->fk_statut < 3)) {
+        if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && ! empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
             $notshippable=0;
             $text_info='';
             $nbprod=0;

From 64a5a260dd76d2f923bf802aba21a99dba604026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 25 Oct 2014 11:54:38 +0200
Subject: [PATCH 38/77] Update admin.lang

---
 htdocs/langs/en_US/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f87b945d71..014229d62d5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1146,6 +1146,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
 ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
 FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).

From 3a626d850397f86c355d514e0feffd3b53e58557 Mon Sep 17 00:00:00 2001
From: MAxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 25 Oct 2014 17:22:03 +0200
Subject: [PATCH 39/77] Add : statistics on supplier orders and invoices on
 home page

---
 .../class/fournisseur.commande.class.php      | 41 +++++++++++++++++
 .../fourn/class/fournisseur.facture.class.php | 42 +++++++++++++++++
 htdocs/index.php                              | 46 ++++++++++++-------
 3 files changed, 113 insertions(+), 16 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7983060490d..6c097cd6d5b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1923,6 +1923,47 @@ class CommandeFournisseur extends CommonOrder
         }
     }
 
+    /**
+     *	Charge indicateurs this->nb de tableau de bord
+     *
+     *	@return     int         <0 si ko, >0 si ok
+     */
+    function load_state_board()
+    {
+        global $conf, $user;
+
+        $this->nb=array();
+        $clause = "WHERE";
+
+        $sql = "SELECT count(co.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+        if (!$user->rights->societe->client->voir && !$user->societe_id)
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $clause = "AND";
+        }
+        $sql.= " ".$clause." co.entity = ".$conf->entity;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $this->nb["supplier_orders"]=$obj->nb;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
     /**
      *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 9c72319f74f..c7067410c41 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1606,6 +1606,48 @@ class FactureFournisseur extends CommonInvoice
         $this->total_ttc      = $xnbp*119.6;
     }
 
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @return         int     <0 if KO, >0 if OK
+	 */
+	function load_state_board()
+	{
+		global $conf, $user;
+
+		$this->nb=array();
+
+		$clause = "WHERE";
+
+		$sql = "SELECT count(f.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
+		}
+		$sql.= " ".$clause." f.entity = ".$conf->entity;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["supplier_invoices"]=$obj->nb;
+			}
+            $this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
     /**
      *	Load an object from its id and create a new one in database
      *
diff --git a/htdocs/index.php b/htdocs/index.php
index 138ddc4e3a9..ebc6760252c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -154,7 +154,9 @@ if (empty($user->societe_id))
 	    ! empty($conf->propal->enabled) && $user->rights->propale->lire,
 	    ! empty($conf->commande->enabled) && $user->rights->commande->lire,
 	    ! empty($conf->facture->enabled) && $user->rights->facture->lire,
-	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer);
+	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer,
+		! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire,
+		! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire);
 	    // Class file containing the method load_state_board for each line
 	    $includes=array(DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
 	    DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php",
@@ -165,7 +167,9 @@ if (empty($user->societe_id))
 	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
 	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
 	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
 	    // Name class containing the method load_state_board for each line
 	    $classes=array('Client',
 	                   'Prospect',
@@ -173,10 +177,12 @@ if (empty($user->societe_id))
 	                   'Adherent',
 	                   'Product',
 	                   'Service',
-					   'Propal',
-					   'Commande',
-					   'Facture',
-	                   'Contrat');
+	                   'Propal',
+	                   'Commande',
+	                   'Facture',
+	                   'Contrat',
+	                   'CommandeFournisseur',
+	                   'FactureFournisseur');
 	    // Cle array returned by the method load_state_board for each line
 	    $keys=array('customers',
 	                'prospects',
@@ -184,10 +190,12 @@ if (empty($user->societe_id))
 	                'members',
 	                'products',
 	                'services',
-					'proposals',
-					'orders',
-					'invoices',
-					'Contracts');
+	                'proposals',
+	                'orders',
+	                'invoices',
+	                'Contracts',
+	                'supplier_orders',
+	                'supplier_invoices');
 	    // Dashboard Icon lines
 	    $icons=array('company',
 	                 'company',
@@ -195,10 +203,12 @@ if (empty($user->societe_id))
 	                 'user',
 	                 'product',
 	                 'service',
-					 'propal',
-					 'order',
-					 'bill',
-					 'order');
+	                 'propal',
+	                 'order',
+	                 'bill',
+	                 'order',
+	                 'order',
+	                 'bill');
 	    // Translation keyword
 	    $titres=array("ThirdPartyCustomersStats",
 	                  "ThirdPartyProspectsStats",
@@ -209,7 +219,9 @@ if (empty($user->societe_id))
 	                  "CommercialProposalsShort",
 	                  "CustomersOrders",
 	                  "BillsCustomers",
-	                  "Contracts");
+	                  "Contracts",
+	                  "SuppliersOrders",
+	                  "SuppliersInvoices");
 	    // Dashboard Link lines
 	    $links=array(DOL_URL_ROOT.'/comm/list.php',
 	    DOL_URL_ROOT.'/comm/prospect/list.php',
@@ -220,7 +232,9 @@ if (empty($user->societe_id))
 	    DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial',
 	    DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial',
 	    DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
-	    DOL_URL_ROOT.'/contrat/list.php');
+	    DOL_URL_ROOT.'/contrat/list.php',
+	    DOL_URL_ROOT.'/fourn/commande/list.php',
+	    DOL_URL_ROOT.'/fourn/facture/list.php');
 	    // Translation lang files
 	    $langfile=array("companies",
 	                    "prospects",

From 26ccb79f24d6b1712672f8544e2b0585cc822502 Mon Sep 17 00:00:00 2001
From: MAxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 25 Oct 2014 19:13:13 +0200
Subject: [PATCH 40/77] Fix : product list was wrong on supplier invoice
 because fourn_id is not fetched

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index a51a6505416..353f053ebea 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -152,7 +152,7 @@ else {
 					'option_disabled' => 'addPredefinedProductButton',	// html id to disable once select is done
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error'
 			);
-			$form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
+			$form->select_produits_fournisseurs($object->fk_soc, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
 		}
 		echo '</span>';
 	}

From 374b761fdf3ad7013c671aa4c1c334da921597cf Mon Sep 17 00:00:00 2001
From: MAxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 25 Oct 2014 19:20:02 +0200
Subject: [PATCH 41/77] Fix : product list was wrong on supplier invoice
 because fourn_id is not fetched

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index a51a6505416..ed06bca8725 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -152,7 +152,7 @@ else {
 					'option_disabled' => 'addPredefinedProductButton',	// html id to disable once select is done
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error'
 			);
-			$form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
+			$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
 		}
 		echo '</span>';
 	}

From efd99a6f44003a6f8d353b2e318572cb20b0e8bc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 27 Oct 2014 10:20:35 +0100
Subject: [PATCH 42/77] Fix : extrafield errors

---
 htdocs/core/tpl/extrafields_view.tpl.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 1591ce9fb6d..d344ef5eb82 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -48,7 +48,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 			print '<table width="100%" class="nobordernopadding"><tr><td';
 			if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"';
 			print '>' . $label . '</td>';
-			if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key]) && $user->rights->propal->creer && ($action != 'edit_extras' || GETPOST('attribute') != $key))
+			if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key]) && $user->rights->{$object->element}->creer && ($action != 'edit_extras' || GETPOST('attribute') != $key))
 				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 			
 			print '</tr></table>';
@@ -59,9 +59,9 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				$value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
 			}
 
-			if ($action == 'edit_extras' && $user->rights->propal->creer && GETPOST('attribute') == $key)
+			if ($action == 'edit_extras' && $user->rights->{$object->element}->creer && GETPOST('attribute') == $key)
 			{
-				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formsoc">';
+				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
 				print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';

From 42008fcf98d7fa90dc685fad4fe3a50be637f588 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 27 Oct 2014 10:22:21 +0100
Subject: [PATCH 43/77] Fix : remove associated users when company is deleted

---
 htdocs/societe/class/societe.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6d80189c7be..54e0edbf76a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1316,6 +1316,19 @@ class Societe extends CommonObject
                 }
             }
 
+            // Remove associated users
+            if (! $error)
+            {
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_commerciaux";
+                $sql.= " WHERE fk_soc = " . $id;
+                dol_syslog(get_class($this)."::Delete", LOG_DEBUG);
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->error = $this->db->lasterror();
+                }
+            }
+
             // Removed extrafields
             if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
             {

From a5739c248ecdf19af7098582ba21641a8c8abd09 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 27 Oct 2014 10:23:33 +0100
Subject: [PATCH 44/77] Fix : Product supplier prices were not working anymore
 due to bad SQL

---
 htdocs/fourn/class/fournisseur.product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index eff9e7e4275..75ac674e877 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -467,7 +467,7 @@ class ProductFournisseur extends Product
 
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
         $sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
-        $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges";
+        $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
         $sql.= " pfp.remise, pfp.remise_percent";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";

From fda32f663886c1dbb47f49a27c0d0bd59039af06 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 27 Oct 2014 11:16:18 +0100
Subject: [PATCH 45/77] FixDosFiles

---
 htdocs/contact/card.php         |  4 +--
 htdocs/core/lib/company.lib.php | 36 ++++++++++++------------
 htdocs/projet/tasks/time.php    | 50 ++++++++++++++++-----------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1ba775268a1..db83554c7ae 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -243,12 +243,12 @@ if (empty($reshook))
         {
         	if ($backtopage)
         	{
-        		header("Location: ".$backtopage);
+        		header("Location: ".$backtopage);
         		exit;
         	}
         	else
         	{
-        		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
+        		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
         		exit;
         	}
         }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c5ba612b60f..3dcfaff48ee 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -110,24 +110,24 @@ function societe_prepare_head($object)
         if (! empty($conf->notification->enabled))
         {
         	$nbNote = 0;
-        	$sql = "SELECT COUNT(n.rowid) as nb";
-        	$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-        	$sql.= " WHERE fk_soc = ".$object->id;
-        	$resql=$db->query($sql);
-        	if ($resql)
-        	{
-        		$num = $db->num_rows($resql);
-        		$i = 0;
-        		while ($i < $num)
-        		{
-        			$obj = $db->fetch_object($resql);
-        			$nbNote=$obj->nb;
-        			$i++;
-        		}
-        	}
-        	else {
-        		dol_print_error($db);
-        	}
+        	$sql = "SELECT COUNT(n.rowid) as nb";
+        	$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+        	$sql.= " WHERE fk_soc = ".$object->id;
+        	$resql=$db->query($sql);
+        	if ($resql)
+        	{
+        		$num = $db->num_rows($resql);
+        		$i = 0;
+        		while ($i < $num)
+        		{
+        			$obj = $db->fetch_object($resql);
+        			$nbNote=$obj->nb;
+        			$i++;
+        		}
+        	}
+        	else {
+        		dol_print_error($db);
+        	}
         	 
         	$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
         	$head[$h][1] = $langs->trans("Notifications");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 13b1e48f477..676b17a5951 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -292,37 +292,37 @@ if ($id > 0 || ! empty($ref))
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
-		// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
-		print dol_print_date($object->date_start,'dayhour');
-		print '</td></tr>';
-		
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
-		print dol_print_date($object->date_end,'dayhour');
-		print '</td></tr>';
-		
-		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
-		print convertSecondToTime($object->planned_workload,'allhourmin');
-		print '</td></tr>';
-		
-		// Progress declared
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-		print $object->progress.' %';
-		print '</td></tr>';
-		
-		// Progress calculated
+		// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
+		print dol_print_date($object->date_start,'dayhour');
+		print '</td></tr>';
+		
+		// Date end
+		print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
+		print dol_print_date($object->date_end,'dayhour');
+		print '</td></tr>';
+		
+		// Planned workload
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
+		print convertSecondToTime($object->planned_workload,'allhourmin');
+		print '</td></tr>';
+		
+		// Progress declared
+		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+		print $object->progress.' %';
+		print '</td></tr>';
+		
+		// Progress calculated
 		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
 		if ($object->planned_workload)
 		{
-			$tmparray=$object->getSummaryOfTimeSpent();
+			$tmparray=$object->getSummaryOfTimeSpent();
 			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
 			else print '0 %';
 		}
-		else print '';
-		print '</td></tr>';
-		
+		else print '';
+		print '</td></tr>';
+		
 		// Project
 		if (empty($withproject))
 		{

From 8b179c0d2a4402a275d2337f69d126594fd07d66 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 27 Oct 2014 14:02:37 +0100
Subject: [PATCH 46/77] Fix : typo

---
 htdocs/contrat/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index af5f83cdbde..5e9179f342f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -938,7 +938,7 @@ if ($action == 'create')
 
 	// Ref Int
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-	print '<td colspan="2"><input type="text" siez="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
+	print '<td colspan="2"><input type="text" size="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
 
     // Customer
 	print '<tr>';

From 0775744b3773f710fa0083c8586187071ce87734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 27 Oct 2014 18:27:46 +0100
Subject: [PATCH 47/77] No thirdparty name in contract list

---
 htdocs/contrat/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index d89c4c144c3..dcc1b83e6d8 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -74,7 +74,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
 $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,';
 $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,";
-$sql.= " s.nom, s.rowid as socid";
+$sql.= " s.nom as name, s.rowid as socid";
 $sql.= " ,c.ref_supplier";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

From a32817db9d0088e56be192bc76519f0b8214135f Mon Sep 17 00:00:00 2001
From: jfefe <jf.ferry@aternatik.fr>
Date: Tue, 28 Oct 2014 23:49:54 +0100
Subject: [PATCH 48/77] Update makepack-dolibarr.pl : indentation

---
 build/makepack-dolibarr.pl | 1416 ++++++++++++++++++------------------
 1 file changed, 708 insertions(+), 708 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 0e8f2ea0fdd..3f637ef856e 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -63,19 +63,19 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files";
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
-    print "Error: Missing environment variables.\n";
+	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-    print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
@@ -85,31 +85,31 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "Error: Can't detect your OS.\n";
+	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
 # Define buildroot
 # ----------------
 if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+	$PROGPATH=$ENV{"ProgramFiles"};
 }
 if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "Error: A temporary directory can not be find.\n";
+	print "Check that TEMP or TMP environment variable is set correctly.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
-    exit 2;
+	sleep 2;
+	exit 2;
 } 
 $BUILDROOT="$TEMP/buildroot";
 
@@ -169,10 +169,10 @@ my $batch=0;
 for (0..@ARGV-1) {
 	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
 	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
+	if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+		$PREFIX=$1; 
+		$FILENAMESNAPSHOT.="-".$PREFIX; 
+	}
 }
 if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTIBETARC is defined
 if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTISTABLE is defined
@@ -192,7 +192,7 @@ print "Target directory (DESTI) : $DESTI\n";
 if ($target) {
 	if ($target eq "ALL") { 
 		foreach my $key (@LISTETARGET) {
-	    	if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
+			if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
 		}
 	}
 	if ($target ne "ALL" && $target ne "SF" && $target ne "ASSO") { $CHOOSEDTARGET{uc($target)}=1; }
@@ -200,56 +200,56 @@ if ($target) {
 	if ($target eq "ASSO") { $CHOOSEDPUBLISH{"ASSO"}=1; }
 }
 else {
-    my $found=0;
-    my $NUM_SCRIPT;
-   	my $cpt=0;
-    while (! $found) {
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
-    	foreach my $target (@LISTETARGET) {
-    		$cpt++;
-    		printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
-    	}
-    	$cpt=98;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    	$cpt=99;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    
-    	# Ask which target to build
-    	print "Choose one package number or several separated with space (0 - ".$cpt."): ";
-    	$NUM_SCRIPT=<STDIN>; 
-    	chomp($NUM_SCRIPT);
-    	if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
-    	{
-    		print "This is not a valid package number list.\n";
-    		$found = 0;
-    	}
-    	else
-    	{
-    		$found = 1;
-    	}
-    }
-    print "\n";
-    if ($NUM_SCRIPT eq "98") {
-   		$CHOOSEDPUBLISH{"ASSO"}=1;
-    }
-    else 
-    {
-    	if ($NUM_SCRIPT eq "99") {
-	   		$CHOOSEDPUBLISH{"SF"}=1;
-	    }
-	    else {
-		    if ($NUM_SCRIPT eq "0") {
-		    	foreach my $key (@LISTETARGET) {
-		    		if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
-		        }
-		    }
-		    else {
-		   		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-		   			$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-		   		}
-		    }
-	    }
-    }
+	my $found=0;
+	my $NUM_SCRIPT;
+	my $cpt=0;
+	while (! $found) {
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+		foreach my $target (@LISTETARGET) {
+			$cpt++;
+			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+		}
+		$cpt=98;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+		$cpt=99;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+	
+		# Ask which target to build
+		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
+		$NUM_SCRIPT=<STDIN>; 
+		chomp($NUM_SCRIPT);
+		if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
+		{
+			print "This is not a valid package number list.\n";
+			$found = 0;
+		}
+		else
+		{
+			$found = 1;
+		}
+	}
+	print "\n";
+	if ($NUM_SCRIPT eq "98") {
+		$CHOOSEDPUBLISH{"ASSO"}=1;
+	}
+	else 
+	{
+		if ($NUM_SCRIPT eq "99") {
+			$CHOOSEDPUBLISH{"SF"}=1;
+		}
+		else {
+			if ($NUM_SCRIPT eq "0") {
+				foreach my $key (@LISTETARGET) {
+					if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+				}
+			}
+			else {
+				foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+					$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+				}
+			}
+		}
+	}
 }
 
 # Test if requirement is ok
@@ -265,34 +265,34 @@ foreach my $target (keys %CHOOSEDTARGET) {
 		}
 		$atleastonerpm=1;			
 	} 
-    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
-    {
-        # Test    
-        print "Test requirement for target $target: Search '$req'... ";
-        $newreq=$req; $newparam='';
-        if ($newreq eq 'zip') { $newparam.='-h'; }
-        if ($newreq eq 'xz') { $newparam.='-h'; }
-        $cmd="\"$newreq\" $newparam 2>&1";
-        print "Test command ".$cmd."... ";
-        $ret=`$cmd`;
-        $coderetour=$?; $coderetour2=$coderetour>>8;
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-            # Not found error, we try in PROGPATH
-            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-            $coderetour=$?; $coderetour2=$coderetour>>8;
-            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-        } 
+	foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
+	{
+		# Test    
+		print "Test requirement for target $target: Search '$req'... ";
+		$newreq=$req; $newparam='';
+		if ($newreq eq 'zip') { $newparam.='-h'; }
+		if ($newreq eq 'xz') { $newparam.='-h'; }
+		$cmd="\"$newreq\" $newparam 2>&1";
+		print "Test command ".$cmd."... ";
+		$ret=`$cmd`;
+		$coderetour=$?; $coderetour2=$coderetour>>8;
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+			# Not found error, we try in PROGPATH
+			$ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+			$coderetour=$?; $coderetour2=$coderetour>>8;
+			$REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+		} 
 
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-            # Not found error
-            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-            $CHOOSEDTARGET{$target}=-1;
-            last;
-        } else {
-            # Pas erreur ou erreur autre que programme absent
-            print " Found ".$req."\n";
-        }
-    }
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+			# Not found error
+			print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+			$CHOOSEDTARGET{$target}=-1;
+			last;
+		} else {
+			# Pas erreur ou erreur autre que programme absent
+			print " Found ".$req."\n";
+		}
+	}
 }
 
 print "\n";
@@ -303,7 +303,7 @@ $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) { next; }
+	if ($CHOOSEDTARGET{$target} < 0) { next; }
 	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
 	{
 		$nboftargetneedbuildroot++;
@@ -311,7 +311,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
 	$nboftargetok++;
 }
 foreach my $target (keys %CHOOSEDPUBLISH) {
-    if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
 	if ($target eq 'SF') { $nbofpublishneedtag++; }
 	$nboftargetok++;
@@ -319,714 +319,714 @@ foreach my $target (keys %CHOOSEDPUBLISH) {
 
 if ($nboftargetok) {
 
-    # Update CVS if required
-    #-----------------------
-    if ($nbofpublishneedtag)
+	# Update CVS if required
+	#-----------------------
+	if ($nbofpublishneedtag)
 	{
-    	print "Go to directory $SOURCE\n";
-   		$olddir=getcwd();
-   		chdir("$SOURCE");
-    	print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-    	$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-    	if ($ret =~ /already exists/)
-    	{
-    		print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
-	    	$QUESTIONOVERWRITETAG=<STDIN>; 
-	    	chomp($QUESTIONOVERWRITETAG);
-	    	if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
-	    	{
-		    	print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-		    	$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
-	    	}
-    	}
-    	print 'Run git push --tags'."\n";
-    	$ret=`git push --tags`;
-    	chdir("$olddir");
+		print "Go to directory $SOURCE\n";
+		$olddir=getcwd();
+		chdir("$SOURCE");
+		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+		$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
+		if ($ret =~ /already exists/)
+		{
+			print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
+			$QUESTIONOVERWRITETAG=<STDIN>; 
+			chomp($QUESTIONOVERWRITETAG);
+			if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
+			{
+				print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
+			}
+		}
+		print 'Run git push --tags'."\n";
+		$ret=`git push --tags`;
+		chdir("$olddir");
 	}
 	
-    # Update buildroot if required
-    #-----------------------------
-    if ($nboftargetneedbuildroot)
+	# Update buildroot if required
+	#-----------------------------
+	if ($nboftargetneedbuildroot)
 	{
-	    if (! $copyalreadydone) {
-	    	print "Creation of a buildroot used for all packages\n";
+		if (! $copyalreadydone) {
+			print "Creation of a buildroot used for all packages\n";
 
-	    	print "Delete directory $BUILDROOT\n";
-	    	$ret=`rm -fr "$BUILDROOT"`;
-	    
-	    	mkdir "$BUILDROOT";
-	    	mkdir "$BUILDROOT/$PROJECT";
-	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
-	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
+			print "Delete directory $BUILDROOT\n";
+			$ret=`rm -fr "$BUILDROOT"`;
+		
+			mkdir "$BUILDROOT";
+			mkdir "$BUILDROOT/$PROJECT";
+			print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
+			$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
 
-	    	#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
-	    	#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
-	    }
-	    print "Clean $BUILDROOT\n";
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
-        
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+			#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
+			#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
+		}
+		print "Clean $BUILDROOT\n";
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+		
+		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
 
-        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
 
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
-   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
-   	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+		#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
+		
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
 
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDTARGET) 
-    {
-        if ($CHOOSEDTARGET{$target} < 0) { next; }
-    
-        print "\nBuild package for target $target\n";
+	# Build package for each target
+	#------------------------------
+	foreach my $target (keys %CHOOSEDTARGET) 
+	{
+		if ($CHOOSEDTARGET{$target} < 0) { next; }
+	
+		print "\nBuild package for target $target\n";
 
-    	if ($target eq 'SNAPSHOT') 
-    	{
-    		$NEWDESTI=$DESTI;
+		if ($target eq 'SNAPSHOT') 
+		{
+			$NEWDESTI=$DESTI;
 
-    		print "Remove target $FILENAMESNAPSHOT.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
+			print "Remove target $FILENAMESNAPSHOT.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
 
-            #rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
+			$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
+			$ret=`$cmd`;
 
-    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
-   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+			print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
+			$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
 			print $cmd."\n";
 			$ret=`$cmd`;
 
-    		# Move to final dir
-       		print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
-       		$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
+			$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
+			next;
+		}
 
-    	if ($target eq 'TGZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+		if ($target eq 'TGZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMETGZ.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
+			print "Remove target $FILENAMETGZ.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMETGZ.tgz");
 
-            #rmdir "$BUILDROOT/$FILENAMETGZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
-            print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMETGZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
+			print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-   		    print "$cmd\n";
-   		    $ret=`$cmd`;
+			print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
+			print "$cmd\n";
+			$ret=`$cmd`;
 
-    		# Move to final dir
-       		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-       		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+			next;
+		}
 
-    	if ($target eq 'XZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+		if ($target eq 'XZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEXZ.xz...\n";
-    		unlink("$NEWDESTI/$FILENAMEXZ.xz");
+			print "Remove target $FILENAMEXZ.xz...\n";
+			unlink("$NEWDESTI/$FILENAMEXZ.xz");
 
-            #rmdir "$BUILDROOT/$FILENAMEXZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEXZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
+			print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
+			chdir("$olddir");
 
-    		# Move to final dir
-            print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
-    		next;
-    	}
-    	
-    	if ($target eq 'ZIP') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+			# Move to final dir
+			print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
+			next;
+		}
+		
+		if ($target eq 'ZIP') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEZIP.zip...\n";
-    		unlink("$NEWDESTI/$FILENAMEZIP.zip");
+			print "Remove target $FILENAMEZIP.zip...\n";
+			unlink("$NEWDESTI/$FILENAMEZIP.zip");
 
-            #rmdir "$BUILDROOT/$FILENAMEZIP";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEZIP";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 
-    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
+			print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
-            			
-    		# Move to final dir
-            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-    		next;
-    	}
-    
-    	if ($target =~ /RPM/)	                 # Linux only 
-    	{
-    		$NEWDESTI=$DESTI;
-    		$subdir="package_rpm_generic";
-    		if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
-    		if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
-    		if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
-    		mkdir($DESTI.'/'.$subdir);
+			chdir("$olddir");
+						
+			# Move to final dir
+			print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
+			next;
+		}
+	
+		if ($target =~ /RPM/)	                 # Linux only 
+		{
+			$NEWDESTI=$DESTI;
+			$subdir="package_rpm_generic";
+			if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
+			if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
+			if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
+			mkdir($DESTI.'/'.$subdir);
 			if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } 
 
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
 
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
 
-    		print "Remove target ".$FILENAMERPM."...\n";
-    		unlink("$NEWDESTI/".$FILENAMERPM);
-    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
-    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
+			print "Remove target ".$FILENAMERPM."...\n";
+			unlink("$NEWDESTI/".$FILENAMERPM);
+			print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
+			unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
 
-    		print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
-    		
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
-    		$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
-            $ret=`$cmd`;
+			print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
+			
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
+			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
+			$ret=`$cmd`;
 
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
 
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
+			$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
 
 			# Build tgz
-    		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
-    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
+			print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
+			$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
 
-    		print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
-    		$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
-            $ret=`$cmd`;
+			print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
+			$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
+			$ret=`$cmd`;
 
-    		$BUILDFIC="${FILENAME}.spec";
-    		$BUILDFICSRC="${FILENAME}_generic.spec";
-    		if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
-    		if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
-    		if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
-    		
- 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
-            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
-            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
-            while (<SPECFROM>) {
-                $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
-                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-    
-    		print "Copy patch file to $RPMDIR/SOURCES\n";
-    		$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
-		    $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
+			$BUILDFIC="${FILENAME}.spec";
+			$BUILDFICSRC="${FILENAME}_generic.spec";
+			if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
+			if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
+			if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
+			
+			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
+			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
+			open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+			while (<SPECFROM>) {
+				$_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
+	
+			print "Copy patch file to $RPMDIR/SOURCES\n";
+			$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
+			$ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
 
-    		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
-    		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
-    		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
+			print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
+			#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
+			$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
 
-    		# Move to final dir
-   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
-   		    $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
-   		    $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
-   		    $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-    		$ret=`$cmd`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
+			$cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
+			$cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
+			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
+			$ret=`$cmd`;
+			next;
+		}
 
-    	if ($target eq 'DEB') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_debian-ubuntu');
+		if ($target eq 'DEB') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/package_debian-ubuntu');
 			if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } 
 
-            $olddir=getcwd();
+			$olddir=getcwd();
 
-    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
-    		print "Remove target ${FILENAMEDEB}.dsc...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
-    		print "Remove target ${FILENAMEDEB}.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
-    		print "Remove target ${FILENAMEDEB}.changes...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.changes");
-    		print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
-    		print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
+			print "Remove target ${FILENAMEDEB}_all.deb...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
+			print "Remove target ${FILENAMEDEB}.dsc...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
+			print "Remove target ${FILENAMEDEB}.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
+			print "Remove target ${FILENAMEDEB}.changes...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.changes");
+			print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
+			print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
 
-    		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-    		$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
-    		
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
+			
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
 			$ret=`$cmd`;
 
- 			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
-            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
-            # Removed duplicate license files
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
-            
-            # Rename upstream changelog to match debian rules
+			print "Remove other files\n";
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
+			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
+			# Removed duplicate license files
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			
+			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
 			
-            # Prepare source package (init debian dir)
-            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
-            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
-            print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
-            # Add files for dpkg-source
-            $ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
-            # Add files also required to build binary package
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            
+			# Prepare source package (init debian dir)
+			print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
+			$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
+			print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+			# Add files for dpkg-source
+			$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
+			# Add files also required to build binary package
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			
 			# Set owners and permissions
-            #print "Set owners on files/dir\n";
-		    #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
+			#print "Set owners on files/dir\n";
+			#$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
 
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
-		    $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            
-          
-            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $ret=`$cmd`;
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			
+		
+			print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$ret=`$cmd`;
 
 
-     		print "Go into directory $BUILDROOT\n";
-            chdir("$BUILDROOT");
+			print "Go into directory $BUILDROOT\n";
+			chdir("$BUILDROOT");
 			
 			# We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native)
-    		print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
-   		    print $cmd."\n";
-   		    $ret=`$cmd`;
+			print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
+			print $cmd."\n";
+			$ret=`$cmd`;
 
 			# Creation of source package          
-     		print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
-            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $cmd="dpkg-buildpackage -us -uc";
-            print "Launch DEB build ($cmd)\n";
-            $ret=`$cmd 2>&1 3>&1`;
-            print $ret."\n";
+			print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
+			#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$cmd="dpkg-buildpackage -us -uc";
+			print "Launch DEB build ($cmd)\n";
+			$ret=`$cmd 2>&1 3>&1`;
+			print $ret."\n";
 
-            chdir("$olddir");
-    		
-    		print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
-    		print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
-    		
-    		# Move to final dir
-            print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
-            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
-        	next;
-        }
-        
-    	if ($target eq 'APS') 
-    	{
+			chdir("$olddir");
+			
+			print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
+			print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
+			
+			# Move to final dir
+			print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
+			$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
+			next;
+		}
+		
+		if ($target eq 'APS') 
+		{
 			$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_aps');
+			mkdir($DESTI.'/package_aps');
 			if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } 
 			
-            $newbuild = $BUILD;
-            $newbuild =~ s/(dev|alpha)/0/gi;                # dev
-            $newbuild =~ s/beta/1/gi;                       # beta
-            $newbuild =~ s/rc./2/gi;                        # rc
-            if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
-            # now newbuild is 0-0 or 0-3 for example
-            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
-            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
-    		
-     		print "Remove target $FILENAMEAPS.zip...\n";
-    		unlink "$NEWDESTI/$FILENAMEAPS.zip";
- 
-            #rmdir "$BUILDROOT/$PROJECT.tmp";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-            print "Create directory $BUILDROOT/$PROJECT.tmp\n";
-            $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
-            $ret=`$cmd`;
+			$newbuild = $BUILD;
+			$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+			$newbuild =~ s/beta/1/gi;                       # beta
+			$newbuild =~ s/rc./2/gi;                        # rc
+			if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+			# now newbuild is 0-0 or 0-3 for example
+			$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+			if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			
+			print "Remove target $FILENAMEAPS.zip...\n";
+			unlink "$NEWDESTI/$FILENAMEAPS.zip";
 
-            print "Remove other files\n";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
+			#rmdir "$BUILDROOT/$PROJECT.tmp";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+			$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+			$ret=`$cmd`;
 
-            $APSVERSION="1.2";
-            print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
-            open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
-            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
-            while (<SPECFROM>) {
-                $newbuild = $BUILD;
-                $newbuild =~ s/(dev|alpha)/0/gi;                # dev
-                $newbuild =~ s/beta/1/gi;                       # beta
-                $newbuild =~ s/rc./2/gi;                        # rc
-                if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
-                # now newbuild is 0-0 or 0-3 for example
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
-                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-            print "Version set to $MAJOR.$MINOR.$newbuild\n";
-            #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
-            #$ret=`$cmd`;
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
-            $ret=`$cmd`;
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
-            $ret=`$cmd`;
- 
-            print "Remove other files\n";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
-            
-            print "Build APP-LIST.xml files\n";
-            
-            print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
- 
-            print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
-            $olddir=getcwd();
-            chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
-            $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
-            print $cmd."\n";
-            $ret= `$cmd`;
-            chdir("$olddir");
-                        
-    		# Move to final dir
-            print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
-            next;
-    	}
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
 
-    	if ($target eq 'EXEDOLIWAMP')
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_windows');
+			$APSVERSION="1.2";
+			print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
+			open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
+			open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
+			while (<SPECFROM>) {
+				$newbuild = $BUILD;
+				$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+				$newbuild =~ s/beta/1/gi;                       # beta
+				$newbuild =~ s/rc./2/gi;                        # rc
+				if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+				# now newbuild is 0-0 or 0-3 for example
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
+			print "Version set to $MAJOR.$MINOR.$newbuild\n";
+			#$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
+			#$ret=`$cmd`;
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
+			$ret=`$cmd`;
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
+			
+			print "Build APP-LIST.xml files\n";
+			
+			print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
+
+			print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
+			$cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
+			print $cmd."\n";
+			$ret= `$cmd`;
+			chdir("$olddir");
+						
+			# Move to final dir
+			print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
+			next;
+		}
+
+		if ($target eq 'EXEDOLIWAMP')
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/package_windows');
 			if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } 
-    		
-     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
-    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
- 
- 			$SOURCEBACK=$SOURCE;
- 			$SOURCEBACK =~ s/\//\\/g;
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
+			
+			print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
+			unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
+
+			$SOURCEBACK=$SOURCE;
+			$SOURCEBACK =~ s/\//\\/g;
+			print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+			$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
 
-    		# Move to final dir
+			# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-    		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
-            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
-    		next;
-    	}
-    }
+			rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+			print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
+			$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
+			next;
+		}
+	}
 
-    # Publish package for each target
-    #--------------------------------
-    foreach my $target (keys %CHOOSEDPUBLISH) 
-    {
-        if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-    
+	# Publish package for each target
+	#--------------------------------
+	foreach my $target (keys %CHOOSEDPUBLISH) 
+	{
+		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	
 		print "\nList of files to publish\n";
-    	%filestoscansf=(
-    		"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
-    		"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-    		"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
-    		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
-    		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
-    	);
-    	use POSIX qw/strftime/;
-    	foreach my $file (sort keys %filestoscansf)
-    	{
-    		$found=0;
-    		my $filesize = -s $file;
-    		my $filedate = (stat $file)[9];
-    		print $file." ".($filesize?"(found)":"(not found)");
-    		print ($filesize?" - ".$filesize:"");
-    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
-    		print "\n";
-    	}
+		%filestoscansf=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
+		);
+		use POSIX qw/strftime/;
+		foreach my $file (sort keys %filestoscansf)
+		{
+			$found=0;
+			my $filesize = -s $file;
+			my $filedate = (stat $file)[9];
+			print $file." ".($filesize?"(found)":"(not found)");
+			print ($filesize?" - ".$filesize:"");
+			print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
+			print "\n";
+		}
 
-    	if ($target eq 'SF' || $target eq 'ASSO') 
-    	{
-    		print "\n";
-    		
-    		if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
+		if ($target eq 'SF' || $target eq 'ASSO') 
+		{
+			print "\n";
+			
+			if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
 			if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { $PUBLISH = $PUBLISHBETARC.'/lastbuild'; }
 			if ($target eq 'ASSO' && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $PUBLISHBETARC.'/stable'; }
 			
-    		$NEWPUBLISH=$PUBLISH;
-    		print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
+			$NEWPUBLISH=$PUBLISH;
+			print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
 
-	    	# Ask which target to build
-	    	$NUM_SCRIPT=<STDIN>; 
-	    	chomp($NUM_SCRIPT);
+			# Ask which target to build
+			$NUM_SCRIPT=<STDIN>; 
+			chomp($NUM_SCRIPT);
 
 			print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n";
-            $ret=`mkdir -p "/tmp/emptydir/"`;
-            
-            %filestoscan=%filestoscansf;
-            
-	    	foreach my $file (sort keys %filestoscan)
-	    	{
-	    		$found=0;
-	    		my $filesize = -s $file;
-	    		if (! $filesize) { next; }
+			$ret=`mkdir -p "/tmp/emptydir/"`;
+			
+			%filestoscan=%filestoscansf;
+			
+			foreach my $file (sort keys %filestoscan)
+			{
+				$found=0;
+				my $filesize = -s $file;
+				if (! $filesize) { next; }
 
 				print "\n";
-	    		print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-	    		
-	    		$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+				print "Publish file ".$file." to ".$filestoscan{$file}."\n";
+				
+				$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
 				#$ssh->login("$user","$pass"); 		
-	    		#use String::ShellQuote qw( shell_quote );
+				#use String::ShellQuote qw( shell_quote );
 				#$ssh->cmd('mkdir '.shell_quote($destFolder).' && exit');
 
 				#use Net::SFTP::Foreign;
@@ -1045,23 +1045,23 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";
-	    	}
-    	}
-    }    
+			}
+		}
+	}    
 }
 
 print "\n----- Summary -----\n";
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) {
-        print "Package $target not built (bad requirement).\n";
-    } else {
-        print "Package $target built successfully in $DESTI\n";
-    }
+	if ($CHOOSEDTARGET{$target} < 0) {
+		print "Package $target not built (bad requirement).\n";
+	} else {
+		print "Package $target built successfully in $DESTI\n";
+	}
 }
 
 if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
+	print "\nPress key to finish...";
+	my $WAITKEY=<STDIN>;
 }
 
 0;

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 49/77] 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 50/77] 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 fa61faec589d4c7b2033e240451461a67b92e304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ignacio=20Jos=C3=A9=20Lizar=C3=A1n=20Rus?=
 <ilizaran@gmail.com>
Date: Wed, 29 Oct 2014 17:43:01 +0100
Subject: [PATCH 51/77] Update server_invoice.php

Create Facture with mode_reglement and cond_reglement using thirdparty information.
---
 htdocs/webservices/server_invoice.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index ef87beace53..9c5bd24b463 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -525,7 +525,15 @@ function createInvoice($authentication,$invoice)
         $newobject->statut=0;	// We start with status draft
         $newobject->fk_project=$invoice['project_id'];
         $newobject->date_creation=$now;
-	$newobject->mode_reglement_id = $invoice['payment_mode_id'];
+        
+	//take mode_reglement and cond_reglement from thirdparty
+        $soc = new Societe($db);
+        $res=$soc->fetch($newobject->socid);
+        if ($res > 0) {
+    	    $newobject->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
+            $newobject->cond_reglement_id  = $soc->cond_reglement_id; 
+        }
+        else $newobject->mode_reglement_id = $invoice['payment_mode_id'];
 
         // Trick because nusoap does not store data with same structure if there is one or several lines
         $arrayoflines=array();

From 38a939771c1dd1a403df94b6b7dad77472ec41f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 17:16:51 +0100
Subject: [PATCH 52/77] New: Add template of emails into dictionnary.

---
 htdocs/admin/dict.php                         | 61 ++++++++++++++++---
 .../install/mysql/migration/3.6.0-3.7.0.sql   |  1 +
 .../mysql/tables/llx_c_email_templates.sql    |  1 +
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d81f306be9e..4d33723a947 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -98,6 +98,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
 $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp";
 $tabname[24]= MAIN_DB_PREFIX."c_type_resource";
+$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
 // Dictionary labels
 $tablib=array();
@@ -125,6 +126,7 @@ $tablib[21]= "DictionaryAvailability";
 $tablib[22]= "DictionarySource";
 $tablib[23]= "DictionaryRevenueStamp";
 $tablib[24]= "DictionaryResourceType";
+$tablib[25]= "DictionaryEMailTemplates";
 
 // Requests to extract data
 $tabsql=array();
@@ -152,6 +154,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content, active FROM ".MAIN_DB_PREFIX."c_email_templates";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
@@ -179,6 +182,7 @@ $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
 $tabsqlsort[23]="country ASC, taux ASC";
 $tabsqlsort[24]="code ASC,label ASC";
+$tabsqlsort[25]="label ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
@@ -206,6 +210,7 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
+$tabfield[25]= "label,type_template,private,position,topic,content";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
@@ -233,6 +238,7 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
+$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
@@ -260,6 +266,7 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
+$tabfieldinsert[25]= "label,type_template,private,position,topic,content";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -288,7 +295,8 @@ $tabrowid[20]= "";
 $tabrowid[21]= "rowid";
 $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
-$tabrowid[23]= "";
+$tabrowid[24]= "";
+$tabrowid[25]= "";
 
 // Condition to show dictionary in setup page
 $tabcond=array();
@@ -316,6 +324,7 @@ $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
 $tabcond[23]= true;
 $tabcond[24]= ! empty($conf->resource->enabled);
+$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
 
 // List of help for fields
 $tabhelp=array();
@@ -343,6 +352,7 @@ $tabhelp[21] = array();
 $tabhelp[22] = array();
 $tabhelp[23] = array();
 $tabhelp[24] = array();
+$tabhelp[25] = array();
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck=array();
@@ -370,6 +380,7 @@ $tabfieldcheck[21] = array();
 $tabfieldcheck[22] = array();
 $tabfieldcheck[23] = array();
 $tabfieldcheck[24] = array();
+$tabfieldcheck[25] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
@@ -442,7 +453,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $ok=1;
     foreach ($listfield as $f => $value)
     {
-        if ($value == 'country' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
+    	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
         if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
         if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
         if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
@@ -489,7 +500,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
     }
-    if (isset($_POST["country"]) && $_POST["country"]=='0')
+    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
     {
     	if (in_array($tablib[$id],array('DictionaryCompanyType')))
     	{
@@ -533,6 +544,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $sql.= $tabfieldinsert[$id];
         $sql.=",active)";
         $sql.= " VALUES(";
+
         // List of values
         if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
         	$sql.= $newid.",";
@@ -846,6 +858,13 @@ if ($id)
             if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+
+            if ($id == 2)	// Special cas for state page
+            {
+            	if ($fieldlist[$field]=='region_id') { $valuetoshow='&nbsp;'; $showfield=1; }
+	            if ($fieldlist[$field]=='region') { $valuetoshow=$langs->trans("Country").'/'.$langs->trans("Region"); $showfield=1; }
+            }
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -856,12 +875,14 @@ if ($id)
              }
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
+
+        if ($id == 4) print '<td></td>';
         print '<td colspan="4">';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '&nbsp;</td>';
         print '</tr>';
 
-        // Line to type new values
+        // Line to enter new values
         print "<tr ".$bc[$var].">";
 
         $obj = new stdClass();
@@ -880,16 +901,25 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
+        if ($id == 3)
+        {
+        	unset($fieldlist[2]);
+        }
+
         if (empty($reshook)) fieldList($fieldlist,$obj);
 
+        if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right"><input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'"></td>';
         print "</tr>";
 
+        $colspan=count($fieldlist)+2;
+        if ($id == 4) $colspan++;;
+
         if (! empty($alabelisused))  // Si un des champs est un libelle
         {
-            print '<tr><td colspan="'.(count($fieldlist)+2).'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
         }
-        print '<tr><td colspan="'.(count($fieldlist)+2).'">&nbsp;</td></tr>';
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
     }
 
     print '</form>';
@@ -965,6 +995,7 @@ if ($id)
                 if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
                 if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
                 if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+
                 // Affiche nom du champ
                 if ($showfield)
                 {
@@ -1302,7 +1333,7 @@ $db->close();
 
 
 /**
- *	Show field
+ *	Show fields in insert/edit mode
  *
  * 	@param		array	$fieldlist		Array of fields
  * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
@@ -1322,14 +1353,22 @@ function fieldList($fieldlist,$obj='',$tabname='')
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($fieldlist[$field] == 'country') {
-			if (in_array('region_id',$fieldlist)) { print '<td>'.join(',',$fieldlist).'&nbsp;</td>'; continue; }	// For state page, we do not show the country input (we link to region, not country)
+			if (in_array('region_id',$fieldlist))
+			{
+				print '<td>';
+				//print join(',',$fieldlist);
+				print '</td>';
+				continue;
+			}	// For state page, we do not show the country input (we link to region, not country)
 			print '<td>';
 			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), 'country', '', 28);
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'country_id') {
 			$country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
+			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'region') {
 			print '<td>';
@@ -1338,7 +1377,9 @@ function fieldList($fieldlist,$obj='',$tabname='')
 		}
 		elseif ($fieldlist[$field] == 'region_id') {
 			$region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
+			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'lang') {
 			print '<td>';
@@ -1377,7 +1418,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
-		elseif ($fieldlist[$field] == 'libelle_facture') {
+		elseif (in_array($fieldlist[$field], array('libelle_facture','content'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
 		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
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..7156acc2ff2 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
@@ -1026,6 +1026,7 @@ create table llx_c_email_templates
   tms             timestamp,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
+  active          tinyint DEFAULT 1  NOT NULL,
   topic			  text,                           -- Predefined topic
   content         text                            -- Predefined text
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 3a72690fb11..b4d2f9a96cb 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -30,6 +30,7 @@ create table llx_c_email_templates
   tms             timestamp,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
+  active          tinyint DEFAULT 1  NOT NULL,
   topic			  text,                           -- Predefined topic
   content         text                            -- Predefined text
 )ENGINE=innodb;

From f7552c83d2f3391a78e1a72d7ae5a49be6f0a74f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 17:50:34 +0100
Subject: [PATCH 53/77] Fix: Must ignore such fields

---
 test/phpunit/FactureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 11795c08fe2..cce025a77eb 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -215,7 +215,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
     	$newlocalobject=new Facture($this->savdb);
     	$newlocalobject->initAsSpecimen();
     	$this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array());    // Actual, Expected
 
     	return $localobject;
     }

From fb4858a5d32c850629f24fde1ac9f49077cb7365 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 18:07:09 +0100
Subject: [PATCH 54/77] Update changelog

---
 ChangeLog                                      | 3 +++
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d6e412ec06e..6b3616e0d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
+- New: Increase length of thirdparty to 128 chars.
+- New: "Is Order shippable" icon #1975.
+- New: statistics on supplier orders and invoices on home page.
 - New: Add permissions to read all trips and expenses.
 - New: Can filter on date into tab "Referring object" of a project.
 - New: Module notification has been enhanced:
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 7156acc2ff2..aa940e4ff20 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
@@ -1064,6 +1064,9 @@ ALTER TABLE llx_adherent CHANGE COLUMN civilite civility VARCHAR(6);
 ALTER TABLE llx_socpeople CHANGE COLUMN civilite civility VARCHAR(6);
 ALTER TABLE llx_user CHANGE COLUMN civilite civility VARCHAR(6);
 
+ALTER TABLE llx_societe CHANGE COLUMN nom varchar(128);
+ALTER TABLE llx_adherent CHANGE COLUMN societe varchar(128);
+
 ALTER TABLE llx_c_type_fees CHANGE COLUMN libelle label VARCHAR(30);
 ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label;
 

From d5f21caca607b5e652981a4bf19bc40fa35e4309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 18:19:41 +0100
Subject: [PATCH 55/77] Update doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 6b3616e0d46..c5aeb5874b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
+- New: Agenda export by project #1967.
 - New: Increase length of thirdparty to 128 chars.
 - New: "Is Order shippable" icon #1975.
 - New: statistics on supplier orders and invoices on home page.

From 2f5c7e5f9d9c29e51e9c915c7bc05ae09150ce98 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 19:28:22 +0100
Subject: [PATCH 56/77] Prepare version 3.7 beta

---
 build/debian/changelog           | 29 ++++++++++++++++++-----------
 build/exe/doliwamp/doliwamp.iss  |  4 ++--
 build/makepack-dolibarr.pl       |  5 ++++-
 build/rpm/dolibarr_fedora.spec   |  3 +++
 build/rpm/dolibarr_generic.spec  |  3 +++
 build/rpm/dolibarr_mandriva.spec |  3 +++
 build/rpm/dolibarr_opensuse.spec |  3 +++
 htdocs/filefunc.inc.php          |  2 +-
 8 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/build/debian/changelog b/build/debian/changelog
index 76e8ae3a2fc..d3772a76785 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,74 +1,81 @@
-dolibarr (3.6.1-3) unstable; urgency=low
+dolibarr (3.7.0-3) UNRELEASED; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 21 Oct 2014 12:00:00 +0100      
+
+dolibarr (3.6.1-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 23 Sep 2014 12:00:00 +0100      
 
-dolibarr (3.6.0-3) unstable; urgency=low
+dolibarr (3.6.0-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 15 July 2014 12:00:00 +0100      
 
-dolibarr (3.5.5-3) unstable; urgency=low
+dolibarr (3.5.5-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
 
-dolibarr (3.5.4-3) unstable; urgency=low
+dolibarr (3.5.4-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
 
-dolibarr (3.5.3-3) unstable; urgency=low
+dolibarr (3.5.3-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 2 May 2014 12:00:00 +0100     
 
-dolibarr (3.5.2-3) unstable; urgency=low
+dolibarr (3.5.2-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 14 March 2014 12:00:00 +0100     
 
-dolibarr (3.5.1-3) unstable; urgency=low
+dolibarr (3.5.1-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 7 Feb 2014 12:00:00 +0100     
 
-dolibarr (3.5.0-3) unstable; urgency=low
+dolibarr (3.5.0-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     
 
-dolibarr (3.4.2-3) unstable; urgency=low
+dolibarr (3.4.2-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * Maintenance release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
 
-dolibarr (3.4.1-3) unstable; urgency=low
+dolibarr (3.4.1-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * Maintenance release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     
 
-dolibarr (3.4.0-3) unstable; urgency=low
+dolibarr (3.4.0-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * Maintenance release.
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 1657ff1c7e7..3a43f7fe656 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.6.1
+AppVerName=DoliWamp-3.7.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.6.1
+OutputBaseFilename=DoliWamp-3.7.0-beta
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 3f637ef856e..2a4af64f5fe 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -436,13 +436,16 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
@@ -452,7 +455,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-		#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
+		#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball due to debian policies
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 156f34bc066..1007c84eb96 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -332,6 +332,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 176cb07975d..5fd9a74f1a6 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -568,6 +568,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index d75c9a84dca..c6fda416db0 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -337,6 +337,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 41ea838f3fb..935ebf2e6df 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -348,6 +348,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 6f8a2bb9b2c..d69de2f1fae 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-alpha');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-beta');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

From 24862d6314c66cffd6fa21d8a7a7984c8846e07b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Oct 2014 22:51:06 +0100
Subject: [PATCH 57/77] Corrections launchpad

---
 build/launchpad/README | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/launchpad/README b/build/launchpad/README
index 973509aa6d1..03ddc7fd4e6 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -61,13 +61,17 @@ If you want to build/test package locally:
 
 - List of series are visible here: https://launchpad.net/dolibarr/+series
 
-# To update Dolibarr into launchpad (when repository for sources already exists)
+# To update Dolibarr into launchpad (when remote repository for sources already exists)
 #----------------------------------
+	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+	bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable]
     cd dolibarr-[dev|beta|stable]
+    # Update
+    bzr update
+	-- Update files here. Remove all and overwrite --
     bzr status
-	-- Update files here --
+	bzr add *
     bzr commit -m "Description of change"
     bzr push
 

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 58/77] 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 9c51effe5cbddf5a3ec01ca2999d433967d08d0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Oct 2014 15:41:58 +0100
Subject: [PATCH 59/77] Ajout plus d'info dans description audit.

---
 htdocs/admin/tools/listevents.php                         | 5 +++--
 htdocs/core/class/events.class.php                        | 4 ++--
 htdocs/core/triggers/interface_20_all_Logevents.class.php | 2 ++
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql            | 4 ++--
 htdocs/main.inc.php                                       | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index c2671f698a4..fe577419eaf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -229,10 +229,11 @@ if ($result)
 		// Description
 		print '<td>';
 		$text=$langs->trans($obj->description);
-		if (preg_match('/\((.*)\)/i',$obj->description,$reg))
+		if (preg_match('/\((.*)\)(.*)/i',$obj->description,$reg))
 		{
 			$val=explode(',',$reg[1]);
 			$text=$langs->trans($val[0], isset($val[1])?$val[1]:'', isset($val[2])?$val[2]:'', isset($val[3])?$val[3]:'', isset($val[4])?$val[4]:'');
+			if (! empty($reg[2])) $text.=$reg[2];
 		}
 		print $text;
 		print '</td>';
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index ba4dcfb94f6..e191773517b 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -111,7 +111,7 @@ class Events // extends CommonObject
 		$this->description=trim($this->description);
 
 		// Check parameters
-		if (! $this->description) { $this->error='ErrorBadValueForParameter'; return -1; }
+		if (empty($this->description)) { $this->error='ErrorBadValueForParameter'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
@@ -129,7 +129,7 @@ class Events // extends CommonObject
 		$sql.= " ".($_SERVER['HTTP_USER_AGENT']?"'".dol_trunc($_SERVER['HTTP_USER_AGENT'],250)."'":'NULL').",";
 		$sql.= " '".$this->db->idate($this->dateevent)."',";
 		$sql.= " ".($user->id?"'".$user->id."'":'NULL').",";
-		$sql.= " '".$this->db->escape($this->description)."'";
+		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index b73d01ec612..34bd187adbf 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -66,7 +66,9 @@ class InterfaceLogevents extends DolibarrTriggers
 
             // Initialisation donnees (date,duree,texte,desc)
             $text="(UserLogged,".$object->login.")";
+            $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
             $desc="(UserLogged,".$object->login.")";
+            $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
         }
         if ($action == 'USER_LOGIN_FAILED')
         {
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 aa940e4ff20..0cacdf1ffae 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
@@ -1064,8 +1064,8 @@ ALTER TABLE llx_adherent CHANGE COLUMN civilite civility VARCHAR(6);
 ALTER TABLE llx_socpeople CHANGE COLUMN civilite civility VARCHAR(6);
 ALTER TABLE llx_user CHANGE COLUMN civilite civility VARCHAR(6);
 
-ALTER TABLE llx_societe CHANGE COLUMN nom varchar(128);
-ALTER TABLE llx_adherent CHANGE COLUMN societe varchar(128);
+ALTER TABLE llx_societe MODIFY COLUMN nom varchar(128);
+ALTER TABLE llx_adherent MODIFY COLUMN societe varchar(128);
 
 ALTER TABLE llx_c_type_fees CHANGE COLUMN libelle label VARCHAR(30);
 ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index efca5d4efba..fa6b503caa7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -460,7 +460,7 @@ if (! defined('NOLOGIN'))
                     $datesecond=dol_stringtotime($_POST["dst_second"]);
                     if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
                 }
-                //print $datefirst.'-'.$datesecond.'-'.$datenow; exit;
+                //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
 
             if (! $login)
@@ -621,6 +621,8 @@ if (! defined('NOLOGIN'))
 
         $user->update_last_login_date();
 
+        $user->trigger_mesg = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+
         // TODO We should use a hook here, not a trigger
         // Call triggers
         include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

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 60/77] 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 61/77] 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 62/77] 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 63/77] 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 64/77] 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 65/77] 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);
                 }

From 2b8abf27941312a193b107f1468abd7e2223afc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Nov 2014 20:07:38 +0100
Subject: [PATCH 66/77] Fix: Missing label

---
 htdocs/core/boxes/box_actions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 7d118932ba4..738582ad931 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -63,7 +63,7 @@ class box_actions extends ModeleBoxes
 		if ($user->rights->agenda->myactions->read)
 		{
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,";
-			$sql.= " ta.code,";
+			$sql.= " ta.code, ta.libelle as type_label,";
 			$sql.= " s.nom as name, s.rowid as socid";
 			$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
 			$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
@@ -96,7 +96,7 @@ class box_actions extends ModeleBoxes
 					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning)) $late=img_warning($langs->trans("Late"));
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
-					$label=$objp->label;
+					$label=empty($objp->label)?$objp->type_label:$objp->label;
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 					'logo' => ("action"),

From 5a18904bb48f19d792c7eb1afbde8c33efafb4a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Nov 2014 21:16:31 +0100
Subject: [PATCH 67/77] Fix: Infinite loop

---
 htdocs/core/lib/date.lib.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index a95bbec6b72..2d5bf7ab0cd 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -566,9 +566,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hour and be GMT dates';
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
 
-	while ($timestampStart < $timestampEnd)		// Loop end when equals
+	$i=0;
+	while ($timestampStart < $timestampEnd && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie=false;
 		$countryfound=0;
@@ -576,7 +577,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 		$jour  = date("d", $timestampStart);
 		$mois  = date("m", $timestampStart);
 		$annee = date("Y", $timestampStart);
-
 		if ($countrycode == 'FR')
 		{
 			$countryfound=1;
@@ -722,8 +722,10 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 		if ($ferie) $nbFerie++;
 
 		// Increase number of days (on go up into loop)
-		$jour++;
-		$timestampStart=dol_mktime(0,0,0,$mois,$jour,$annee,1);	// Generate GMT date for next day
+		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
+		//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
+
+		$i++;
 	}
 
 	return $nbFerie;
@@ -764,13 +766,16 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
  *	@param     	int			$inhour             0: return number of days, 1: return number of hours
  *	@param		int			$lastday            We include last day, 0: no, 1:yes
  *  @param		int			$halfday			Tag to define half day when holiday start and end
+ *  @param      string		$countrycode        Country code (company country code if not defined)
  *	@return    	int								Number of days or hours
  */
-function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0)
+function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='')
 {
-	global $langs;
+	global $langs,$mysoc;
 
-	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday);
+	if (empty($country_code)) $country_code=$mysoc->country_code;
+
+	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
 	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
@@ -779,7 +784,9 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
 	{
-		$nbOpenDay = num_between_day($timestampStart, $timestampEnd, $lastday) - num_public_holiday($timestampStart, $timestampEnd, $lastday);
+		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
+		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code);
+		$nbOpenDay = $numdays - $numholidays;
 		$nbOpenDay.= " " . $langs->trans("Days");
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));

From 1f4f2291f610585b3958fc9f8e7070f65990b976 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Nov 2014 21:18:16 +0100
Subject: [PATCH 68/77] Start module with status experimental

---
 htdocs/core/modules/modSyncSupplierWebServices.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php
index 088989f9de4..c17892ee217 100755
--- a/htdocs/core/modules/modSyncSupplierWebServices.class.php
+++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php
@@ -44,7 +44,7 @@ class modSyncSupplierWebServices extends DolibarrModules
         // 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
+        $this->version = 'experimental';                        // '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)

From ddf737daed9e5ea7d5ab6223570be68e089044c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 01:07:07 +0100
Subject: [PATCH 69/77] Removed deprecated page and option.

---
 htdocs/comm/action/card.php     |   8 +-
 htdocs/comm/action/contact.php  | 258 --------------------------------
 htdocs/comm/action/document.php | 163 +++++++++++++-------
 htdocs/core/lib/agenda.lib.php  |   8 -
 4 files changed, 114 insertions(+), 323 deletions(-)
 delete mode 100644 htdocs/comm/action/contact.php

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 607f8e14c4e..a1e6f89f663 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -790,11 +790,11 @@ if ($id > 0)
 {
 	$result1=$object->fetch($id);
 	$result2=$object->fetch_thirdparty();
-	$result2=$object->fetch_contact();
-	$result3=$object->fetch_userassigned();
-	$result4=$object->fetch_optionals($id,$extralabels);
+	$result3=$object->fetch_contact();
+	$result4=$object->fetch_userassigned();
+	$result5=$object->fetch_optionals($id,$extralabels);
 
-	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0)
+	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
 	{
 		dol_print_error($db,$object->error);
 		exit;
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
deleted file mode 100644
index 334da53a2f4..00000000000
--- a/htdocs/comm/action/contact.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Philippe Grand       <philippe.grand@atoo-net.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/>.
- */
-
-/**
- *       \file       htdocs/comm/action/contact.php
- *       \ingroup    agenda
- *       \brief      Page for multi-users event
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("other");
-$langs->load("bills");
-
-$id      = GETPOST('id','int');
-$action  = GETPOST('action','alpha');
-$ref	 = GETPOST('ref');
-$confirm = GETPOST('confirm');
-$lineid  = GETPOST('lineid','int');
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-}
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
-
-
-$object = new ActionComm($db);
-
-
-/*
- * Actions
- */
-
-// Add new contact
-if ($action == 'addcontact' && $user->rights->action->creer)
-{
-	$result = $object->fetch($id);
-
-    if ($object->id > 0)
-    {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
-		}
-		else
-		{
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-// modification d'un contact. On enregistre le type
-if ($action == 'updateline')
-{
-	if ($object->fetch($id))
-	{
-		$contact = $object->detail_contact($_POST["line"]);
-		$type = $_POST["type"];
-		$statut = $contact->statut;
-
-		$result = $object->update_contact($_POST["line"], $statut, $type);
-		if ($result >= 0)
-		{
-			$db->commit();
-		} else
-		{
-			dol_print_error($db, "result=$result");
-			$db->rollback();
-		}
-	}
-	else
-	{
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Bascule du statut d'un contact
-else if ($action == 'swapstatut')
-{
-	if ($object->id > 0)
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-}
-
-// Efface un contact
-else if ($action == 'deletecontact')
-{
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formcompany= new FormCompany($db);
-
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
-
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
-
-
-if ($id > 0 || ! empty($ref))
-{
-	if ($object->fetch($id,$ref) > 0)
-	{
-
-		$head=actions_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("Action"),0,'action');
-
-		// Affichage fiche action en mode visu
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-		print '</td></tr>';
-
-		// Type
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
-			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
-		}
-
-		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
-
-		// Date start
-		print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
-		if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-		else print dol_print_date($object->datep,'day');
-		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
-        print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_month">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_week">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_day">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-        print '</form>'."\n";
-        print '</td>';
-		print '</tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
-        if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-		else print dol_print_date($object->datef,'day');
-		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td></tr>';
-
-        // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
-
-        print '</table>';
-
-   		dol_fiche_end();
-
-   		print '<br>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-		    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
-		}
-
-	}
-	else
-	{
-		print "ErrorRecordNotFound";
-	}
-}
-
-llxFooter();
-
-$db->close();
-
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 5e180f66abb..9bb3af6dcbd 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -41,7 +41,7 @@ $langs->load("commercial");
 $langs->load("other");
 $langs->load("bills");
 
-$objectid = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $action=GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -53,13 +53,13 @@ if ($user->societe_id > 0)
 	unset($_GET["action"]);
 	$action='';
 }
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 
 $object = new ActionComm($db);
 
-if ($objectid > 0)
+if ($id > 0)
 {
-	$ret = $object->fetch($objectid);
+	$ret = $object->fetch($id);
 	$object->fetch_thirdparty();
 }
 
@@ -96,11 +96,25 @@ llxHeader('',$langs->trans("Agenda"),$help_url);
 
 if ($object->id > 0)
 {
+	$result1=$object->fetch($id);
+	$result2=$object->fetch_thirdparty();
+	$result3=$object->fetch_contact();
+	$result4=$object->fetch_userassigned();
+	$result5=$object->fetch_optionals($id,$extralabels);
+
+	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
+	{
+		dol_print_error($db,$object->error);
+		exit;
+	}
+
+	if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
+	if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+
 	$author=new User($db);
 	$author->fetch($object->author->id);
 	$object->author=$author;
 
-	$object->fetch_contact();
 
 	$head=actions_prepare_head($object);
 
@@ -132,53 +146,15 @@ if ($object->id > 0)
 	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
 
 	// Date start
-	print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
+	print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="3">';
 	if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
 	else print dol_print_date($object->datep,'day');
 	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 	print '</td>';
-	print '<td rowspan="5" align="center" valign="middle" width="180">'."\n";
-	print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_month">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-	print '</form>'."\n";
-	print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_week">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-	print '</form>'."\n";
-	print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_day">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-	print '</form>'."\n";
-    print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="show_peruser">';
-    print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-    print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-    print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-    //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-    print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
-    print '</form>'."\n";
-    print '</td>';
 	print '</tr>';
 
 	// Date end
-	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
 	if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
 	else print dol_print_date($object->datef,'day');
 	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
@@ -190,16 +166,38 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Location
-	print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+	{
+		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+	}
 
 	// Assigned to
-	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
-	if ($object->userownerid > 0)
+	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+	$listofuserid=array();
+	if (empty($donotclearsession))
 	{
-		$tmpuser=new User($object->userownerid);
-		print $tmpuser->getNomUrl(1);
+		if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
+		if (! empty($object->userassigned))	// Now concat assigned users
+		{
+			// Restore array with key with same value than param 'id'
+			$tmplist1=$object->userassigned; $tmplist2=array();
+			foreach($tmplist1 as $key => $val)
+			{
+				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+			}
+		}
+		$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
 	}
-	print '</td></tr>';
+	else
+	{
+		if (!empty($_SESSION['assignedtouser']))
+		{
+			$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+		}
+	}
+	print $form->select_dolusers_forevent('view','assignedtouser',1);
+	if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
+	print '	</td></tr>';
 
 	print '</table><br><br><table class="border" width="100%">';
 
@@ -252,8 +250,20 @@ if ($object->id > 0)
 	print ($object->priority?$object->priority:'');
 	print '</td></tr>';
 
+	// Other attributes
+	$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields,'edit');
+	}
 
-	print '</table><br><br><table class="border" width="100%">';
+
+	print '</table>';
+
+	print '<br><br>';
+
+	print '<table class="border" width="100%">';
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -266,7 +276,8 @@ if ($object->id > 0)
 
 	print '<tr><td width="30%" nowrap>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-	print '</table>';
+
+		print '</table>';
 
 	print '</div>';
 
@@ -274,6 +285,52 @@ if ($object->id > 0)
 	$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+
+
+	if ($action != 'edit')
+	{
+		print "<br>";
+
+		// Link to agenda views
+		print '<div id="agendaviewbutton">';
+		print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_month">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_week">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_day">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_peruser">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+		print '</form>'."\n";
+		print '</div>';
+	}
 }
 else
 {
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 3d9a5e8299c..d2270cb5584 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -440,14 +440,6 @@ function actions_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (! empty($conf->global->AGENDA_USE_SEVERAL_CONTACTS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/action/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Contacts");
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     $upload_dir = $conf->agenda->dir_output . "/" . $object->id;

From b2ed53b78563fd4d64c202b43d4ff2318f7c25f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 15:47:33 +0100
Subject: [PATCH 70/77] Fix: Switch company/individual

---
 htdocs/societe/soc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 54effb54b20..d9c5e70283c 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -781,7 +781,7 @@ else
             print '<div class="hideonsmartphone float">';
             print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
             print '</div>';
-            print '<input type="radio" id="1radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked="checked"').'>';
+            print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked="checked"').'>';
 	        print '<label for="radiocompany">';
 	        print '&nbsp;';
             print $langs->trans("Company/Fundation");

From 155452ba91d751cb42214b48204dbcfce114fe96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 16:20:55 +0100
Subject: [PATCH 71/77] Fix: Proposal deadlock situation New: Add missing
 trigger PROPAL_CLASSIFYBILLED.

---
 htdocs/comm/propal.php                        | 28 ++++----
 htdocs/comm/propal/class/propal.class.php     | 67 ++++++++-----------
 ...terface_50_modAgenda_ActionsAuto.class.php | 13 +++-
 .../mysql/data/llx_c_action_trigger.sql       |  1 +
 .../install/mysql/migration/3.6.0-3.7.0.sql   |  1 +
 htdocs/langs/en_US/other.lang                 | 39 +++++------
 6 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 189f1f9c041..fcdda5eaaa1 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -535,7 +535,7 @@ else if ($action == 'classifybilled' && $user->rights->propal->cloturer) {
 // Reopen proposal
 else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
 	// prevent browser refresh from reopening proposal several times
-	if ($object->statut == 2 || $object->statut == 3) {
+	if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
 		$object->reopen($user, 1);
 	}
 }
@@ -2201,7 +2201,7 @@ if ($action == 'create')
 				}
 
 				// ReOpen
-				if (($object->statut == 2 || $object->statut == 3) && $user->rights->propal->cloturer) {
+				if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->propal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
 					print '>' . $langs->trans('ReOpen') . '</a></div>';
 				}
@@ -2368,13 +2368,13 @@ if ($action == 'create')
 		$formmail->withcancel = 1;
 
 		// Tableau des substitutions
-		$formmail->substit ['__PROPREF__'] = $object->ref;
-		$formmail->substit ['__SIGNATURE__'] = $user->signature;
-		$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit ['__PERSONALIZED__'] = '';
-		$formmail->substit ['__CONTACTCIVNAME__'] = '';
+		$formmail->substit['__PROPREF__'] = $object->ref;
+		$formmail->substit['__SIGNATURE__'] = $user->signature;
+		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
+		$formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+		$formmail->substit['__PERSONALIZED__'] = '';
+		$formmail->substit['__CONTACTCIVNAME__'] = '';
 
 		// Find the good contact adress
 		$custcontact = '';
@@ -2391,15 +2391,15 @@ if ($action == 'create')
 			}
 
 			if (! empty($custcontact)) {
-				$formmail->substit ['__CONTACTCIVNAME__'] = $custcontact;
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
 			}
 		}
 
 		// Tableau des parametres complementaires
-		$formmail->param ['action'] = 'send';
-		$formmail->param ['models'] = 'propal_send';
-		$formmail->param ['id'] = $object->id;
-		$formmail->param ['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'propal_send';
+		$formmail->param['id'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 		// Init list of files
 		if (GETPOST("mode") == 'init') {
 			$formmail->clear_attached_files();
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c056e5aa1c5..c07c5592bba 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1739,8 +1739,14 @@ class Propal extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
+        	$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+        	$trigger_name='PROPAL_CLOSE_REFUSED';
+
             if ($statut == 2)
             {
+            	$trigger_name='PROPAL_CLOSE_SIGNED';
+				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+
                 // The connected company is classified as a client
                 $soc=new Societe($this->db);
                 $soc->id = $this->socid;
@@ -1752,48 +1758,31 @@ class Propal extends CommonObject
                     $this->db->rollback();
                     return -2;
                 }
-
-                if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-                {
-                	// Define output language
-                	$outputlangs = $langs;
-                	if (! empty($conf->global->MAIN_MULTILANGS))
-                	{
-                		$outputlangs = new Translate("",$conf);
-                		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
-                		$outputlangs->setDefaultLang($newlang);
-                	}
-                	//$ret=$object->fetch($id);    // Reload to get new records
-	                $this->generateDocument($conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                }
-
-                // Call trigger
-                $result=$this->call_trigger('PROPAL_CLOSE_SIGNED',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
             }
-            else
+            if ($statut == 4)
             {
-
-            	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-            	{
-            		// Define output language
-            		$outputlangs = $langs;
-            		if (! empty($conf->global->MAIN_MULTILANGS))
-            		{
-            			$outputlangs = new Translate("",$conf);
-            			$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
-            			$outputlangs->setDefaultLang($newlang);
-            		}
-            		//$ret=$object->fetch($id);    // Reload to get new records
-		            $this->generateDocument($conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            	}
-
-                // Call trigger
-                $result=$this->call_trigger('PROPAL_CLOSE_REFUSED',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+            	$trigger_name='PROPAL_CLASSIFYBILLED';
             }
+
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+             	// Define output language
+              	$outputlangs = $langs;
+               	if (! empty($conf->global->MAIN_MULTILANGS))
+               	{
+               		$outputlangs = new Translate("",$conf);
+               		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
+               		$outputlangs->setDefaultLang($newlang);
+               	}
+               	//$ret=$object->fetch($id);    // Reload to get new records
+	               $this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+
+            // Call trigger
+            $result=$this->call_trigger($trigger_name,$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+
             if ( ! $error )
             {
                 $this->db->commit();
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index d4fe47c0faa..8b237333c56 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -145,6 +145,17 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPAL_CLASSIFYBILLED')
+        {
+            $langs->load("propal");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
@@ -222,7 +233,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/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 67363b98c72..0dddb1abb0d 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -65,6 +65,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFYBILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',36);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37);
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 93aa4df8083..e6cbfa4cfad 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
@@ -23,6 +23,7 @@
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention delete','Executed when a intervention is delete','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFYBILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
 
 ALTER TABLE llx_notify ADD COLUMN fk_soc integer NULL after fk_action;
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 1e74b72f635..f5b39b3f704 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -203,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
 ##### Export #####
 Export=Export
 ExportsArea=Exports area

From 17b372a4b9782e7c4a5d091a688396126cec82af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 16:29:45 +0100
Subject: [PATCH 72/77] css generic

---
 htdocs/theme/eldy/style.css.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b8467076f40..0f5644dc406 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -830,7 +830,7 @@ foreach($mainmenuusedarray as $val)
 
 .bodylogin
 {
-	background: #fbfbfb;
+	background: #f0f0f0;
 	/* -moz-box-shadow:    inset 0 0 10px #000000;
    	-webkit-box-shadow: inset 0 0 10px #000000;
    	box-shadow:         inset 0 0 10px #000000; */
@@ -861,22 +861,27 @@ form#login {
 	padding-bottom:12px;
 	max-width: 540px;
 
-	border: 1px solid #C0C0C0;
-	background-color: #E0E0E0;
-
-    -moz-box-shadow: 3px 2px 20px #CCC;
+	background-color: #FFFFFF;
+	
+	-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);
+	/*-moz-box-shadow: 3px 2px 20px #CCC;
     -webkit-box-shadow: 3px 2px 20px #CCC;
-    box-shadow: 3px 2px 20px #CCC;
+    box-shadow: 3px 2px 20px #CCC;*/
 
 	border-radius: 8px;
-	border:solid 1px rgba(128,128,128,.4);
+	border:solid 1px rgba(80,80,80,.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 cf6a0df3e4c7bc6df972f333edf73d53d63d4555 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 17:23:02 +0100
Subject: [PATCH 73/77] A lot of fix in missing intervention trigger. Align key
 to use same name to avoid future bugs.

---
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/core/class/commonobject.class.php      |  5 ++--
 ...terface_50_modAgenda_ActionsAuto.class.php | 28 +++++++++++++------
 .../mysql/data/llx_c_action_trigger.sql       |  6 ++--
 .../install/mysql/migration/3.6.0-3.7.0.sql   |  8 +++---
 htdocs/langs/en_US/agenda.lang                |  3 --
 htdocs/langs/en_US/interventions.lang         |  7 +++++
 7 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c07c5592bba..15d85afec07 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1761,7 +1761,7 @@ class Propal extends CommonObject
             }
             if ($statut == 4)
             {
-            	$trigger_name='PROPAL_CLASSIFYBILLED';
+            	$trigger_name='PROPAL_CLASSIFY_BILLED';
             }
 
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 23981b1a343..ad9149d48b0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2074,7 +2074,8 @@ abstract class CommonObject
         	if (! $error)
 			{
 				$trigkey='';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFYBILLED';
+				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
+				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
 
 				if ($trigkey)
 				{
@@ -2566,7 +2567,7 @@ abstract class CommonObject
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
-				else 
+				else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 					$reshook=$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8b237333c56..346932ec61e 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -149,7 +149,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid=0;
 		}
-		elseif ($action == 'PROPAL_CLASSIFYBILLED')
+		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             $langs->load("propal");
 
@@ -264,7 +264,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_CREATE')
         {
-            $langs->load("other");
+        	$langs->load("other");
             $langs->load("interventions");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -292,7 +292,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_MODIFY')
         {
-            $langs->load("other");
+        	$langs->load("other");
             $langs->load("interventions");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -304,7 +304,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->fk_element=0;
 			$object->elementtype='';
 		}
-        elseif ($action == 'FICHINTER_SENTBYMAIL')
+		elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
         	$langs->load("other");
             $langs->load("interventions");
@@ -316,19 +316,31 @@ class InterfaceActionsAuto extends DolibarrTriggers
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
         }
-        elseif ($action == 'FICHINTER_CLASSIFYBILLED')
+        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             $langs->load("other");
             $langs->load("interventions");
 
             $object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilled",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionClassifiedBilled",$object->ref);
+           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
         }
-		elseif ($action == 'FICHINTER_DELETE')
+	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        {
+            $langs->load("other");
+            $langs->load("interventions");
+
+            $object->actiontypecode='AC_OTH_AUTO';
+           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'FICHINTER_DELETE')
         {
             $langs->load("other");
             $langs->load("interventions");
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 0dddb1abb0d..29adb70c46e 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -60,12 +60,14 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFYBILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',36);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37);
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 e6cbfa4cfad..4c31bef8055 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
@@ -21,9 +21,11 @@
 
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention delete','Executed when a intervention is delete','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFYBILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFYBILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
 
 ALTER TABLE llx_notify ADD COLUMN fk_soc integer NULL after fk_action;
 
@@ -47,8 +49,6 @@ ALTER TABLE llx_fichinter ADD COLUMN ref_ext 	varchar(255);
 -- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
 ALTER TABLE llx_c_typent ADD COLUMN fk_country integer NULL AFTER libelle;
 
-INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_CLASSIFY_BILLED','Classify intervention as billed','Executed when a intervention is classified as billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);
-
 INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
 
 ALTER TABLE llx_user ADD COLUMN fk_user_creat integer AFTER tms;
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index e1ca9d2a5c3..45f5017671f 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -51,7 +51,6 @@ OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
 OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +58,6 @@ 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
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Third party created
 DateActionPlannedStart= Planned start date
 DateActionPlannedEnd= Planned end date
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 7655616ffc5..3e4011b0b79 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -31,6 +31,13 @@ RelatedInterventions=Related interventions
 ShowIntervention=Show intervention
 SendInterventionRef=Submission of intervention %s
 SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
 TypeContact_fichinter_internal_INTERVENING=Intervening

From 54e2803926a93961f258cbe1908aa937e3d0ff4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 17:48:10 +0100
Subject: [PATCH 74/77] Missing search table for interventions

---
 htdocs/comm/index.php                 | 17 +++++++++++++++++
 htdocs/fichinter/list.php             |  8 +++++++-
 htdocs/langs/en_US/interventions.lang |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index c5347246719..4129b561ed1 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -118,6 +118,23 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	print "<br>";
 }
 
+// Search contract
+if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAnIntervention").'</td></tr>';
+	print '<tr '.$bc[$var].'>';
+	print '<td class="nowrap"><label for="search_contract">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_inter" id="search_inter" size="18"></td>';
+	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
+	print '</tr>';
+	print "</table></form>\n";
+	print "<br>";
+}
+
 /*
  * Draft proposals
  */
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 076ad9bc689..4bea6c46850 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -56,10 +56,11 @@ if (! $sortfield)
 }
 $limit = $conf->liste_limit;
 
-$search_ref=GETPOST('search_ref','alpha');
+$search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_inter','alpha');
 $search_company=GETPOST('search_company','alpha');
 $search_desc=GETPOST('search_desc','alpha');
 $search_status=GETPOST('search_status');
+$sall=GETPOST('sall');
 
 
 /*
@@ -99,6 +100,11 @@ if (! $user->rights->societe->client->voir && empty($socid))
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)
 	$sql.= " AND s.rowid = " . $socid;
+if ($sall) {
+	$arraytosearch=array('f.ref', 'f.description', 's.nom');
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $arraytosearch=array('f.ref', 'f.description', 's.nom', 'fd.description');
+	$sql .= natural_search($arraytosearch, $sall);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 //print $sql;
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 3e4011b0b79..c79da05364e 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -38,6 +38,7 @@ InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
 InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
 InterventionSentByEMail=Intervention %s sent by EMail
 InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
 TypeContact_fichinter_internal_INTERVENING=Intervening

From a4a01de8a13d5b4425cc4ebf76358d5a18a92805 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 18:00:11 +0100
Subject: [PATCH 75/77] Fix: Missing label

---
 htdocs/core/lib/agenda.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index d2270cb5584..44e962de3ea 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -206,7 +206,7 @@ function show_array_actions_to_do($max=5)
 	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
 	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql.= " c.code, c.libelle,";
+	$sql.= " c.code, c.libelle as type_label,";
 	$sql.= " s.nom as sname, s.rowid, s.client";
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."actioncomm as a ON c.id = a.fk_action";
@@ -243,7 +243,7 @@ function show_array_actions_to_do($max=5)
             print '<tr '.$bc[$var].'>';
 
             $staticaction->type_code=$obj->code;
-            $staticaction->libelle=$obj->label;
+            $staticaction->label=($obj->label?$obj->label:$obj->type_label);
             $staticaction->id=$obj->id;
             print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 

From b6b6cced307621bb97b8dcd1dd378deade696d9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 20:02:11 +0100
Subject: [PATCH 76/77] Fix: Test sur user assigned not filled Can use empty
 line into select boolean form.

---
 htdocs/comm/action/card.php           |  6 +++---
 htdocs/core/class/html.form.class.php | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index a1e6f89f663..96db3133cf9 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -251,11 +251,11 @@ if ($action == 'add')
 	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1;
 
 	// Check parameters
-	if (empty($object->userownerid))
+	if (empty($object->userownerid) && empty($_SESSION['assignedtouser']))
 	{
 		$error++; $donotclearsession=1;
 		$action = 'create';
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors');
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors');
 	}
 	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
 	{
@@ -423,7 +423,7 @@ if ($action == 'update')
 		{
 			$error++; $donotclearsession=1;
 			$action = 'edit';
-			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionAffectedTo")), 'errors');
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors');
 		}
 
 		// Fill array 'array_options' with data from add form
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8e369151fd7..eb7b3d8af4f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4166,18 +4166,18 @@ class Form
     /**
      *	Return an html string with a select combo box to choose yes or no
      *
-     *	@param	string	$htmlname		Name of html select field
-     *	@param	string	$value			Pre-selected value
-     *	@param	int		$option			0 return yes/no, 1 return 1/0
-     *	@param	bool	$disabled		true or false
-     *	@return	mixed					See option
+     *	@param	string		$htmlname		Name of html select field
+     *	@param	string		$value			Pre-selected value
+     *	@param	int			$option			0 return yes/no, 1 return 1/0
+     *	@param	bool		$disabled		true or false
+     *  @param	useempty	$useempty		1=Add empty line
+     *	@return	mixed						See option
      */
-    function selectyesno($htmlname,$value='',$option=0,$disabled=false)
+    function selectyesno($htmlname,$value='',$option=0,$disabled=false,$useempty='')
     {
         global $langs;
 
         $yes="yes"; $no="no";
-
         if ($option)
         {
             $yes="1";
@@ -4187,15 +4187,17 @@ class Form
         $disabled = ($disabled ? ' disabled="disabled"' : '');
 
         $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
+        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected="selected"':'').'></option>'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
             $resultyesno .= '<option value="'.$yes.'" selected="selected">'.$langs->trans("Yes").'</option>'."\n";
             $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
         }
         else
-        {
+       {
+       		$selected=($useempty?'':' selected="selected"');
             $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
-            $resultyesno .= '<option value="'.$no.'" selected="selected">'.$langs->trans("No").'</option>'."\n";
+            $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
         }
         $resultyesno .= '</select>'."\n";
         return $resultyesno;

From 0b41df7c35a076be6ec128d98f4b15e9021b5290 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Nov 2014 00:33:50 +0100
Subject: [PATCH 77/77] Clean code to manage multiselect jquery: All code is
 centralized into function multipleselectarray (except loading of css). Code
 is prepared to choose which plugin to use (only a if is required to switch or
 add a new manager). Introduce working version with multiple-select jquery
 plugin. Removed deprecated old jquery plugin.

---
 COPYRIGHT                                     |  62 +--
 htdocs/core/class/html.form.class.php         |  86 ++--
 .../jquery/plugins/multiple-select/LICENSE    |  21 +
 .../jquery/plugins/multiple-select/README.md  |  96 ++++
 .../multiple-select/jquery.multiple.select.js | 466 +++++++++++++++++
 .../multiple-select/multiple-select.css       | 183 +++++++
 .../multiple-select.jquery.json               |  28 +
 .../multiple-select/multiple-select.png       | Bin 0 -> 3342 bytes
 .../plugins/multiselect/MIT-LICENSE.txt       |  20 -
 .../multiselect/css/ui.multiselect.css        |  31 --
 .../plugins/multiselect/js/ui.multiselect.js  | 480 ------------------
 htdocs/main.inc.php                           |  11 +-
 12 files changed, 879 insertions(+), 605 deletions(-)
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/LICENSE
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/README.md
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
 create mode 100644 htdocs/includes/jquery/plugins/multiple-select/multiple-select.png
 delete mode 100644 htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
 delete mode 100644 htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
 delete mode 100644 htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js

diff --git a/COPYRIGHT b/COPYRIGHT
index c0d8389369c..fd54e10f354 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -9,41 +9,41 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
-Component             Version       License                     GPL Compatible  Usage
+Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date            0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor              4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
-FPDI                  1.4.2         Apache Software License 2.0 Yes             PDF templates management
-FPDF_TPL              1.2           Apache Software License 2.0 Yes             PDF templates management
-GeoIP                 1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-NuSoap                0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
-odtPHP                1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel              1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHPPrintIPP           1.3           GPL-2+                      Yes             Library to send print IPP requests
-TCPDF                 6.0.093       LGPL-3+                     Yes             PDF generation
+AdoDb-Date             0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
+CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
+FPDI                   1.4.2         Apache Software License 2.0 Yes             PDF templates management
+FPDF_TPL               1.2           Apache Software License 2.0 Yes             PDF templates management
+GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+PHPExcel               1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
+TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
 
 JS libraries:
-jQuery                1.8.2         MIT License                 Yes             JS library
-jQuery UI             1.9.1         GPL and MIT License         Yes             JS library plugin UI
-jQuery UI Multiselect ?             GPL and MIT License         Yes             JS library plugin for sexier multiselect
-jQuery blockUI        2.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
-jQuery Colorpicker    1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
-jQuery DataTables     1.9.4         BSD                         Yes             JS library for tables output
-jQuery FileUpload     5.0.3         GPL and MIT License         Yes             JS library to upload files
-jQuery Flot           0.7           MIT License                 Yes             JS library to build graph
-jQuery JCrop          0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
-jQuery Jeditable      1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
-jQuery jNotify        1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
-jQuery jPicker        1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jqueryFileTree 1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jquerytreeview 1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
-jQuery Layout         1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
-jQuery Mobile         1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
-jQuery TableDnD       0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
-jQuery Timepicker     1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jQuery Tiptip         1.3           GPL and MIT License         Yes             JS library for tooltips
-jsGantt               1.2           BSD License                 Yes             JS library (to build Gantt reports)
+jQuery                 1.8.2         MIT License                 Yes             JS library
+jQuery UI              1.9.1         GPL and MIT License         Yes             JS library plugin UI
+jQuery multiple-select 1.1.0        MIT License                 Yes             JS library plugin for sexier multiselect
+jQuery blockUI         2.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
+jQuery DataTables      1.9.4         BSD                         Yes             JS library for tables output
+jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
+jQuery Flot            0.7           MIT License                 Yes             JS library to build graph
+jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
+jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
+jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
+jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery Layout          1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
+jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
+jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
+jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index eb7b3d8af4f..bade0344680 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4032,9 +4032,10 @@ class Form
      *	@param  int		$translate		Translate and encode value
      * 	@param	int		$maxlen			Length maximum for labels
      * 	@param	int		$disabled		Html select box is disabled
-     *  @param	int		$sort			'ASC' or 'DESC' =Sort on label, '' or 'NONE'=Do not sort
+     *  @param	int		$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' = Do not sort
      *  @param	string	$morecss		Add more class to css styles
      * 	@return	string					HTML select string.
+     *  @see multiselectarray
      */
     static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='')
     {
@@ -4092,54 +4093,65 @@ class Form
      *
      *	@param	string	$htmlname		Name of select
      *	@param	array	$array			Array with key+value
-     *	@param	array	$selected		Preselected keys
+     *	@param	array	$selected		Array with key+value preselected
      *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
      *	@param	int		$value_as_key   1 to use value as key
      *	@param  string	$option         Valeur de l'option en fonction du type choisi
      *	@param  int		$translate		Translate and encode value
+     *  @param	int		$width			Force width of select box. May be used only when using jquery couch.
      *	@return	string					HTML multiselect string
+     *  @see selectarray
      */
-    function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0)
+    static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0, $width=0)
     {
     	global $conf, $langs;
 
-    	$out = '<select id="'.$htmlname.'" class="multiselect" multiple="multiple" name="'.$htmlname.'[]"'.$option.'>'."\n";
+    	// Add code for jquery to use multiselect
+    	// Note: Plugin "multiselect" is no more provided by Dolibarr. You must include it and load it into your module to use it.
+    	if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ($conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiselect'))
+    		|| (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))
+    	{
+	    	print '<!-- JS CODE FOR multiselect -->
+				<script type="text/javascript">
+				$(document).ready(function () {
+					$.extend($.ui.multiselect.locale, {
+						addAll:\''.$langs->transnoentities("AddAll").'\',
+						removeAll:\''.$langs->transnoentities("RemoveAll").'\',
+						itemsCount:\''.$langs->transnoentities("ItemsCount").'\'
+					});
+					$(function(){
+						$("#'.$htmlname.'").multiselect({
+							searchable: false,
+							width: '.($width?$width:300).',
+							height: 120
+						});
+					});
+				});
+				</script>';
+    	}
+
+        // Add code for jquery to use multiple-select
+    	// Note: Plugin "multiselect" is no more provided by Dolibarr. You must include it and load it into your module to use it.
+    	if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ($conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiple-select'))
+    		|| (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))
+    	{
+	    	print '<!-- JS CODE FOR multiple-select -->
+			<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiple-select/jquery.multiple.select.js"></script>
+	    	<script type="text/javascript">
+				$(document).ready(function () {
+        			$(\'#'.$htmlname.'\').multipleSelect();
+        		});
+			</script>';
+    	}
+
+    	// Try also magic suggest
+
+    	$out = '<select id="'.$htmlname.'" class="multiselect" multiple="multiple" name="'.$htmlname.'[]"'.$option.($width?' style="width: '.$width.'px"':'').'>'."\n";
     	if (is_array($array) && ! empty($array))
     	{
     		if ($value_as_key) $array=array_combine($array, $array);
 
-    		if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && is_array($selected) && ! empty($selected))
-    		{
-    			foreach ($selected as $selected_value)
-    			{
-    				foreach($array as $key => $value)
-    				{
-    					if ($selected_value == $key)
-    					{
-    						$value=$array[$selected_value];
-    						$out.= '<option value="'.$key.'" selected="selected">';
-    						$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
-    						$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-    						$out.= dol_htmlentitiesbr($newval);
-    						$out.= '</option>'."\n";
-    						unset($array[$key]);
-    					}
-    				}
-    			}
-
-    			if (! empty($array))
-    			{
-    				foreach ($array as $key => $value)
-    				{
-    					$out.= '<option value="'.$key.'">';
-    					$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
-    					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-    					$out.= dol_htmlentitiesbr($newval);
-    					$out.= '</option>'."\n";
-    				}
-    			}
-    		}
-    		else
+    		if (! empty($array))
     		{
     			foreach ($array as $key => $value)
     			{
@@ -4150,7 +4162,7 @@ class Form
     				}
     				$out.= '>';
 
-    				$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
+    				$newval = ($translate ? $langs->trans($value) : $value);
     				$newval = ($key_in_label ? $key.' - '.$newval : $newval);
     				$out.= dol_htmlentitiesbr($newval);
     				$out.= '</option>'."\n";
diff --git a/htdocs/includes/jquery/plugins/multiple-select/LICENSE b/htdocs/includes/jquery/plugins/multiple-select/LICENSE
new file mode 100644
index 00000000000..c3ebd2b5248
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/multiple-select/LICENSE
@@ -0,0 +1,21 @@
+(The MIT License)
+
+Copyright (c) 2012-2014 Zhixin Wen <wenzhixin2010@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiple-select/README.md b/htdocs/includes/jquery/plugins/multiple-select/README.md
new file mode 100644
index 00000000000..81b82ba74c0
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/multiple-select/README.md
@@ -0,0 +1,96 @@
+# Multiple Select
+
+Multiple select is a jQuery plugin to select multiple elements with checkboxes :).
+
+To get started checkout examples and documentation at http://wenzhixin.net.cn/p/multiple-select
+
+## Contributors
+
+Multiple select is due to the excellent work of the following contributors:
+
+<table>
+<tbody>
+<tr><th align="left">文翼</th><td><a href="https://github.com/wenzhixin">GitHub/wenzhixin</a></td></tr>
+<tr><th align="left">Gaurav Jassal</th><td><a href="https://github.com/creativeaura">GitHub/creativeaura</a></td><</tr>
+<tr><th align="left">guli</th><td><a href="https://github.com/guli">GitHub/guli</a></td></tr>
+<tr><th align="left">jwheadon</th><td><a href="https://github.com/jwheadon">GitHub/jwheadon</a></td></tr>
+<tr><th align="left">yx</th><td><a href="https://github.com/qqfish">GitHub/qqfish</a></td></tr>
+<tr><th align="left">Tobias Macey</th><td><a href="https://github.com/blarghmatey">GitHub/blarghmatey</a></td></tr>
+<tr><th align="left">Jona Goldman</th><td><a href="https://github.com/jonagoldman">GitHub/jonagoldman</a></td></tr>
+<tr><th align="left">Alex Jeffrey</th><td><a href="https://github.com/ajeffrey">GitHub/ajeffrey</a></td></tr>
+</tbody>
+</table>
+
+## Changelog
+
+### 1.1.0
+
+* Fix #63: Add ```keepOpen``` option.
+* Fix #62: Fix ```isOpen``` and ```filter``` options are both true bug.
+* Fix #57: Fire onCheckAll event when literally select.
+* Add data attributes for support.
+* Fix #55: Add ```name``` option.
+
+### 1.0.9
+
+* Fix #42: Add ```styler``` option to custom item style.
+* Fix firefox click bug.
+* Add ```allSelected```, ```minumimCountSelected``` and ```countSelected``` options.
+* Fix #35: Add ```onFocus``` and ```onBlur``` events.
+* Fix #25: Add ```focus``` and ```blur``` methods.
+* Fix #31: Trigger the onCheckAll & onUncheckAll events when use filter to select all.
+
+### 1.0.8
+
+* Update the license to The MIT License.
+* Fix #47: Add ```No matches found``` message when there are no results found.
+* Fix #43: Add ```position``` option.
+
+### 1.0.7
+
+* Fix #44: The filters not working bugs.
+
+### 1.0.6
+
+* Fix #21: Add ```single``` option.
+* Add ```override``` option.
+* Add ```container``` option.
+* Fix #29: Update the optgroups select text.
+* Fix #30: Image is not shown in Firefox 25.0.1.
+* Fix #22: fix group filter problem.
+
+### 1.0.5
+
+* Update the button text witdh.
+* Add keyboard support.
+
+### 1.0.4
+
+* Fix #12: Add ```width``` option.
+* Fix #11: Add callback events.
+* Add ```maxHeight``` option.
+
+### 1.0.3
+
+* Fix #4: Add ```filter``` option.
+* Support mobile devices.
+* Fix #6: Add ```refresh``` method.
+
+### 1.0.2
+
+* Fix #7: Add ```selected``` and ```disabled``` options.
+* Fix #5: Add ```checkAll``` and ```uncheckAll``` methods.
+
+### 1.0.1
+
+* Fix #3: Add optgroups support.
+* Add ```placeholder``` option.
+* Fix #2: use prop method instead of attr.
+
+### 1.0.0
+
+* Initial release
+
+## LICENSE
+
+[The MIT License](https://github.com/wenzhixin/multiple-select/blob/master/LICENSE)
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js b/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
new file mode 100644
index 00000000000..32e6635bbaa
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
@@ -0,0 +1,466 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ * @version 1.1.0
+ * 
+ * http://wenzhixin.net.cn/p/multiple-select/
+ */
+
+(function($) {
+
+    'use strict';
+
+    function MultipleSelect($el, options) {
+        var that = this,
+            name = $el.attr('name') || options.name || '',
+            elWidth = $el.width();
+
+        this.$el = $el.hide();
+        this.options = options;
+
+        this.$parent = $('<div class="ms-parent"></div>');
+        this.$choice = $('<button type="button" class="ms-choice"><span class="placeholder">' +
+            options.placeholder + '</span><div></div></button>');
+        this.$drop = $('<div class="ms-drop ' + options.position + '"></div>');
+        this.$el.after(this.$parent);
+        this.$parent.append(this.$choice);
+        this.$parent.append(this.$drop);
+
+        if (this.$el.prop('disabled')) {
+            this.$choice.addClass('disabled');
+        }
+        this.$choice.css('width', elWidth + 'px');
+        this.$drop.css({
+            width: (options.width || elWidth) + 'px'
+        });
+
+        if (!this.options.keepOpen) {
+            $('body').click(function(e) {
+                if ($(e.target)[0] === that.$choice[0] ||
+                    $(e.target).parents('.ms-choice')[0] === that.$choice[0]) {
+                    return;
+                }
+                if (($(e.target)[0] === that.$drop[0] ||
+                    $(e.target).parents('.ms-drop')[0] !== that.$drop[0]) &&
+                    that.options.isOpen) {
+                    that.close();
+                }
+            });
+        }
+
+        this.selectAllName = 'name="selectAll' + name + '"';
+        this.selectGroupName = 'name="selectGroup' + name + '"';
+        this.selectItemName = 'name="selectItem' + name + '"';
+    }
+
+    MultipleSelect.prototype = {
+        constructor : MultipleSelect,
+
+        init: function() {
+            var that = this,
+                html = [];
+            if (this.options.filter) {
+                html.push(
+                    '<div class="ms-search">',
+                        '<input type="text" autocomplete="off" autocorrect="off" autocapitilize="off" spellcheck="false">',
+                    '</div>'
+                );
+            }
+            html.push('<ul>');
+            if (this.options.selectAll && !this.options.single) {
+                html.push(
+                    '<li>',
+                        '<label>',
+                            '<input type="checkbox" ' + this.selectAllName + ' /> ',
+                            '[' + this.options.selectAllText + ']',
+                        '</label>',
+                    '</li>'
+                );
+            }
+            $.each(this.$el.children(), function(i, elm) {
+                html.push(that.optionToHtml(i, elm));
+            });
+            html.push('<li class="ms-no-results">No matches found</li>');
+            html.push('</ul>');
+            this.$drop.html(html.join(''));
+            this.$drop.find('ul').css('max-height', this.options.maxHeight + 'px');
+            this.$drop.find('.multiple').css('width', this.options.multipleWidth + 'px');
+
+            this.$searchInput = this.$drop.find('.ms-search input');
+            this.$selectAll = this.$drop.find('input[' + this.selectAllName + ']');
+            this.$selectGroups = this.$drop.find('input[' + this.selectGroupName + ']');
+            this.$selectItems = this.$drop.find('input[' + this.selectItemName + ']:enabled');
+            this.$disableItems = this.$drop.find('input[' + this.selectItemName + ']:disabled');
+            this.$noResults = this.$drop.find('.ms-no-results');
+            this.events();
+            this.update();
+
+            if (this.options.isOpen) {
+                this.open();
+            }
+        },
+
+        optionToHtml: function(i, elm, group, groupDisabled) {
+            var that = this,
+                $elm = $(elm),
+                html = [],
+                multiple = this.options.multiple,
+                disabled,
+                type = this.options.single ? 'radio' : 'checkbox';
+
+            if ($elm.is('option')) {
+                var value = $elm.val(),
+                    text = $elm.text(),
+                    selected = $elm.prop('selected'),
+                    style = this.options.styler(value) ? ' style="' + this.options.styler(value) + '"' : '';
+
+                disabled = groupDisabled || $elm.prop('disabled');
+                html.push(
+                    '<li' + (multiple ? ' class="multiple"' : '') + style + '>',
+                        '<label' + (disabled ? ' class="disabled"' : '') + '>',
+                            '<input type="' + type + '" ' + this.selectItemName + ' value="' + value + '"' +
+                                (selected ? ' checked="checked"' : '') +
+                                (disabled ? ' disabled="disabled"' : '') +
+                                (group ? ' data-group="' + group + '"' : '') +
+                                '/> ',
+                            text,
+                        '</label>',
+                    '</li>'
+                );
+            } else if (!group && $elm.is('optgroup')) {
+                var _group = 'group_' + i,
+                    label = $elm.attr('label');
+
+                disabled = $elm.prop('disabled');
+                html.push(
+                    '<li class="group">',
+                        '<label class="optgroup' + (disabled ? ' disabled' : '') + '" data-group="' + _group + '">',
+                            '<input type="checkbox" ' + this.selectGroupName +
+                                (disabled ? ' disabled="disabled"' : '') + ' /> ',
+                            label,
+                        '</label>',
+                    '</li>');
+                $.each($elm.children(), function(i, elm) {
+                    html.push(that.optionToHtml(i, elm, _group, disabled));
+                });
+            }
+            return html.join('');
+        },
+
+        events: function() {
+            var that = this;
+            this.$choice.off('click').on('click', function(e) {
+                e.preventDefault();
+                that[that.options.isOpen ? 'close' : 'open']();
+            })
+                .off('focus').on('focus', this.options.onFocus)
+                .off('blur').on('blur', this.options.onBlur);
+
+            this.$parent.off('keydown').on('keydown', function(e) {
+                switch (e.which) {
+                    case 27: // esc key
+                        that.close();
+                        that.$choice.focus();
+                        break;
+                }
+            });
+            this.$searchInput.off('keyup').on('keyup', function() {
+                that.filter();
+            });
+            this.$selectAll.off('click').on('click', function() {
+                var checked = $(this).prop('checked'),
+                    $items = that.$selectItems.filter(':visible');
+                if ($items.length === that.$selectItems.length) {
+                    that[checked ? 'checkAll' : 'uncheckAll']();
+                } else { // when the filter option is true
+                    that.$selectGroups.prop('checked', checked);
+                    $items.prop('checked', checked);
+                    that.options[checked ? 'onCheckAll' : 'onUncheckAll']();
+                    that.update();
+                }
+            });
+            this.$selectGroups.off('click').on('click', function() {
+                var group = $(this).parent().attr('data-group'),
+                    $items = that.$selectItems.filter(':visible'),
+                    $children = $items.filter('[data-group="' + group + '"]'),
+                    checked = $children.length !== $children.filter(':checked').length;
+                $children.prop('checked', checked);
+                that.updateSelectAll();
+                that.update();
+                that.options.onOptgroupClick({
+                    label: $(this).parent().text(),
+                    checked: checked,
+                    children: $children.get()
+                });
+            });
+            this.$selectItems.off('click').on('click', function() {
+                that.updateSelectAll();
+                that.update();
+                that.updateOptGroupSelect();
+                that.options.onClick({
+                    label: $(this).parent().text(),
+                    value: $(this).val(),
+                    checked: $(this).prop('checked')
+                });
+            });
+        },
+
+        open: function() {
+            if (this.$choice.hasClass('disabled')) {
+                return;
+            }
+            this.options.isOpen = true;
+            this.$choice.find('>div').addClass('open');
+            this.$drop.show();
+            if (this.options.container) {
+                var offset = this.$drop.offset();
+                this.$drop.appendTo($(this.options.container));
+                this.$drop.offset({ top: offset.top, left: offset.left });
+            }
+            if (this.options.filter) {
+                this.$searchInput.val('');
+                this.filter();
+            }
+            this.options.onOpen();
+        },
+
+        close: function() {
+            this.options.isOpen = false;
+            this.$choice.find('>div').removeClass('open');
+            this.$drop.hide();
+            if (this.options.container) {
+                this.$parent.append(this.$drop);
+                this.$drop.css({
+                    'top': 'auto',
+                    'left': 'auto'
+                })
+            }
+            this.options.onClose();
+        },
+
+        update: function() {
+            var selects = this.getSelects('text'),
+                $span = this.$choice.find('>span');
+            if (selects.length === this.$selectItems.length + this.$disableItems.length && this.options.allSelected) {
+                $span.removeClass('placeholder').html(this.options.allSelected);
+            } else if (selects.length > this.options.minumimCountSelected && this.options.countSelected) {
+                $span.removeClass('placeholder').html(this.options.countSelected
+                    .replace('#', selects.length)
+                    .replace('%', this.$selectItems.length + this.$disableItems.length));
+            } else if (selects.length) {
+                $span.removeClass('placeholder').html(selects.join(', '));
+            } else {
+                $span.addClass('placeholder').html(this.options.placeholder);
+            }
+            // set selects to select
+            this.$el.val(this.getSelects());
+        },
+
+        updateSelectAll: function() {
+            var $items = this.$selectItems.filter(':visible');
+            this.$selectAll.prop('checked', $items.length &&
+                $items.length === $items.filter(':checked').length);
+            if (this.$selectAll.prop('checked')) {
+                this.options.onCheckAll();
+            }
+        },
+
+        updateOptGroupSelect: function() {
+            var $items = this.$selectItems.filter(':visible');
+            $.each(this.$selectGroups, function(i, val) {
+                var group = $(val).parent().attr('data-group'),
+                    $children = $items.filter('[data-group="' + group + '"]');
+                $(val).prop('checked', $children.length &&
+                    $children.length === $children.filter(':checked').length);
+            });
+        },
+
+        //value or text, default: 'value'
+        getSelects: function(type) {
+            var that = this,
+                texts = [],
+                values = [];
+            this.$drop.find('input[' + this.selectItemName + ']:checked').each(function() {
+                texts.push($(this).parent().text());
+                values.push($(this).val());
+            });
+
+            if (type === 'text' && this.$selectGroups.length) {
+                texts = [];
+                this.$selectGroups.each(function() {
+                    var html = [],
+                        text = $.trim($(this).parent().text()),
+                        group = $(this).parent().data('group'),
+                        $children = that.$drop.find('[' + that.selectItemName + '][data-group="' + group + '"]'),
+                        $selected = $children.filter(':checked');
+
+                    if ($selected.length === 0) {
+                        return;
+                    }
+
+                    html.push('[');
+                    html.push(text);
+                    if ($children.length > $selected.length) {
+                        var list = [];
+                        $selected.each(function() {
+                            list.push($(this).parent().text());
+                        });
+                        html.push(': ' + list.join(', '));
+                    }
+                    html.push(']');
+                    texts.push(html.join(''));
+                });
+            }
+            return type === 'text' ? texts : values;
+        },
+
+        setSelects: function(values) {
+            var that = this;
+            this.$selectItems.prop('checked', false);
+            $.each(values, function(i, value) {
+                that.$selectItems.filter('[value="' + value + '"]').prop('checked', true);
+            });
+            this.$selectAll.prop('checked', this.$selectItems.length ===
+                this.$selectItems.filter(':checked').length);
+            this.update();
+        },
+
+        enable: function() {
+            this.$choice.removeClass('disabled');
+        },
+
+        disable: function() {
+            this.$choice.addClass('disabled');
+        },
+
+        checkAll: function() {
+            this.$selectItems.prop('checked', true);
+            this.$selectGroups.prop('checked', true);
+            this.$selectAll.prop('checked', true);
+            this.update();
+            this.options.onCheckAll();
+        },
+
+        uncheckAll: function() {
+            this.$selectItems.prop('checked', false);
+            this.$selectGroups.prop('checked', false);
+            this.$selectAll.prop('checked', false);
+            this.update();
+            this.options.onUncheckAll();
+        },
+
+        focus: function() {
+            this.$choice.focus();
+            this.options.onFocus();
+        },
+
+        blur: function() {
+            this.$choice.blur();
+            this.options.onBlur();
+        },
+
+        refresh: function() {
+            this.init();
+        },
+
+        filter: function() {
+            var that = this,
+                text = $.trim(this.$searchInput.val()).toLowerCase();
+            if (text.length === 0) {
+                this.$selectItems.parent().show();
+                this.$disableItems.parent().show();
+                this.$selectGroups.parent().show();
+            } else {
+                this.$selectItems.each(function() {
+                    var $parent = $(this).parent();
+                    $parent[$parent.text().toLowerCase().indexOf(text) < 0 ? 'hide' : 'show']();
+                });
+                this.$disableItems.parent().hide();
+                this.$selectGroups.each(function() {
+                    var $parent = $(this).parent();
+                    var group = $parent.attr('data-group'),
+                        $items = that.$selectItems.filter(':visible');
+                    $parent[$items.filter('[data-group="' + group + '"]').length === 0 ? 'hide' : 'show']();
+                });
+
+                //Check if no matches found
+                if (this.$selectItems.filter(':visible').length) {
+                    this.$selectAll.parent().show();
+                    this.$noResults.hide();
+                } else {
+                    this.$selectAll.parent().hide();
+                    this.$noResults.show();
+                }
+            }
+            this.updateOptGroupSelect();
+            this.updateSelectAll();
+        }
+    };
+
+    $.fn.multipleSelect = function() {
+        var option = arguments[0],
+            args = arguments,
+
+            value,
+            allowedMethods = [
+                'getSelects', 'setSelects',
+                'enable', 'disable',
+                'checkAll', 'uncheckAll',
+                'focus', 'blur',
+                'refresh'
+            ];
+
+        this.each(function() {
+            var $this = $(this),
+                data = $this.data('multipleSelect'),
+                options = $.extend({}, $.fn.multipleSelect.defaults,
+                    $this.data(), typeof option === 'object' && option);
+
+            if (!data) {
+                data = new MultipleSelect($this, options);
+                $this.data('multipleSelect', data);
+            }
+
+            if (typeof option === 'string') {
+                if ($.inArray(option, allowedMethods) < 0) {
+                    throw "Unknown method: " + option;
+                }
+                value = data[option](args[1]);
+            } else {
+                data.init();
+            }
+        });
+
+        return value ? value : this;
+    };
+
+    $.fn.multipleSelect.defaults = {
+        name: '',
+        isOpen: false,
+        placeholder: '',
+        selectAll: true,
+        selectAllText: 'Select all',
+        allSelected: 'All selected',
+        minumimCountSelected: 3,
+        countSelected: '# of % selected',
+        multiple: false,
+        multipleWidth: 80,
+        single: false,
+        filter: false,
+        width: undefined,
+        maxHeight: 250,
+        container: null,
+        position: 'bottom',
+        keepOpen: false,
+
+        styler: function() {return false;},
+
+        onOpen: function() {return false;},
+        onClose: function() {return false;},
+        onCheckAll: function() {return false;},
+        onUncheckAll: function() {return false;},
+        onFocus: function() {return false;},
+        onBlur: function() {return false;},
+        onOptgroupClick: function() {return false;},
+        onClick: function() {return false;}
+    };
+})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
new file mode 100644
index 00000000000..d824e0c7a2b
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
@@ -0,0 +1,183 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ */
+
+.ms-parent {
+    display: inline-block;
+    position: relative;
+    vertical-align: middle;
+}
+
+.ms-choice {
+    display: block;
+    height: 26px;
+    padding: 0;
+    overflow: hidden;
+    cursor: pointer;
+    border: 1px solid #aaa;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    background-color: #fff;
+}
+
+.ms-choice.disabled {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.ms-choice > span {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+    padding-left: 8px;
+}
+
+.ms-choice > span.placeholder {
+    color: #999;
+}
+
+.ms-choice > div {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 20px;
+    height: 25px;
+    background: url('multiple-select.png') right top no-repeat;
+}
+
+.ms-choice > div.open {
+    background: url('multiple-select.png') left top no-repeat;
+}
+
+.ms-drop {
+    overflow: hidden;
+    display: none;
+    margin-top: -1px;
+    padding: 0;
+    position: absolute;
+    z-index: 1000;
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+.ms-drop.bottom {
+    top: 100%;
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+}
+
+.ms-drop.top {
+    bottom: 100%;
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.ms-search {
+    display: inline-block;
+    margin: 0;
+    min-height: 26px;
+    padding: 4px;
+    position: relative;
+    white-space: nowrap;
+    width: 100%;
+    z-index: 10000;
+}
+
+.ms-search input {
+    width: 100%;
+    height: auto !important;
+    min-height: 24px;
+    padding: 0 20px 0 5px;
+    margin: 0;
+    outline: 0;
+    font-family: sans-serif;
+    font-size: 1em;
+    border: 1px solid #aaa;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    background: #fff url('multiple-select.png') no-repeat 100% -22px;
+    background: url('multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('multiple-select.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+}
+
+.ms-search, .ms-search input {
+    -webkit-box-sizing: border-box;
+    -khtml-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.ms-drop ul {
+    overflow: auto;
+    margin: 0;
+    padding: 5px 8px;
+}
+
+.ms-drop ul > li {
+    list-style: none;
+    display: list-item;
+    background-image: none;
+    position: static;
+}
+
+.ms-drop ul > li .disabled {
+    opacity: .35;
+    filter: Alpha(Opacity=35);
+}
+
+.ms-drop ul > li.multiple {
+    display: block;
+    float: left;
+}
+
+.ms-drop ul > li.group {
+    clear: both;
+}
+
+.ms-drop ul > li.multiple label {
+    width: 100%;
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.ms-drop ul > li label.optgroup {
+    font-weight: bold;
+}
+
+.ms-drop input[type="checkbox"] {
+    vertical-align: middle;
+}
+
+.ms-drop .ms-no-results {
+    display: none;
+}
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
new file mode 100644
index 00000000000..dd636fda7e0
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
@@ -0,0 +1,28 @@
+{
+    "name": "multiple-select",
+    "version": "1.1.0",
+    "title": "Multiple Select",
+    "description": "Multiple select is a jQuery plugin to select multiple elements with checkboxes :).",
+    "author": {
+        "name": "zhixin wen",
+        "email": "wenzhixin2010@gmail.com",
+        "url": "http://wenzhixin.net.cn/"
+    },
+    "licenses": [
+        {
+            "type": "MIT License",
+            "url": "http://opensource.org/licenses/MIT"
+        }
+    ],
+    "dependencies": {
+        "jquery": ">=1.7"
+    },
+    "keywords": ["multiple.select", "select.list", "multiple.choose", "checkbox"],
+    "homepage": "http://wenzhixin.net.cn/p/multiple-select/",
+    "demo": "http://wenzhixin.net.cn/p/multiple-select/#examples",
+    "bugs": {
+        "url": "https://github.com/wenzhixin/multiple-select/issues"
+    },
+    "docs": "http://wenzhixin.net.cn/p/multiple-select/#documentation",
+    "download": "https://github.com/wenzhixin/multiple-select/archive/master.zip"
+}
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png b/htdocs/includes/jquery/plugins/multiple-select/multiple-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a7ba608ea846d4873f84e00455ee2d1bbe4d13a
GIT binary patch
literal 3342
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
Y016sCsn^Dnga7~l07*qoM6N<$f>N<r+yDRo

literal 0
HcmV?d00001

diff --git a/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt b/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
deleted file mode 100644
index 1076f8b4b2b..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 Michael Aufreiter, http://www.quasipartikel.at
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css b/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
deleted file mode 100644
index 7d3a44801d2..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Multiselect
-----------------------------------*/
-
-.ui-multiselect { border: solid 1px; font-size: 0.8em; }
-.ui-multiselect ul { -moz-user-select: none; }
-.ui-multiselect li { margin: 0; padding: 0; cursor: default; line-height: 20px; height: 20px; font-size: 11px; list-style: none; padding-right: 18px; overflow: hidden; }
-.ui-multiselect li a { color: #999; text-decoration: none; padding: 0; display: block; float: left; cursor: pointer;}
-.ui-multiselect li.ui-draggable-dragging { padding-left: 10px; }
-
-.ui-multiselect div.selected { position: relative; padding: 0; margin: 0; border: 0; float:left; }
-.ui-multiselect ul.selected { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; position: relative; width: 100%; }
-
-.ui-multiselect div.available { position: relative; padding: 0; margin: 0; border: 0; float:left; }
-.ui-multiselect ul.available { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; width: 100%; }
-.ui-multiselect ul.available li { padding-left: 10px; }
-
-.ui-multiselect div.right-column { border-left: 1px solid; }
-
-.ui-multiselect .ui-state-default { border: none; margin-bottom: 1px; position: relative; padding-left: 20px;}
-.ui-multiselect .ui-state-hover { border: none; }
-.ui-multiselect .ui-widget-header {border: none; font-size: 11px; margin-bottom: 1px;}
-
-.ui-multiselect .add-all { float: right; padding: 7px;}
-.ui-multiselect .remove-all { float: right; padding: 7px;}
-.ui-multiselect .search { float: left; padding: 4px;}
-.ui-multiselect .count { float: left; padding: 7px;}
-
-.ui-multiselect li span.ui-icon-arrowthick-2-n-s { position: absolute; left: 2px; }
-.ui-multiselect li a.action { position: absolute; right: 2px; top: 2px; }
-
-.ui-multiselect input.search { height: 14px; padding: 1px; opacity: 0.5; margin: 4px; width: 100px; }
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js b/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
deleted file mode 100644
index eb4578fc782..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * jQuery UI Multiselect
- *
- * Authors:
- *  Michael Aufreiter (quasipartikel.at)
- *  Yanick Rochon (yanick.rochon[at]gmail[dot]com)
- *
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://www.quasipartikel.at/multiselect/
- *
- *
- * Depends:
- *	ui.core.js
- *	ui.sortable.js
- *
- * Optional:
- * localization (http://plugins.jquery.com/project/localisation)
- * scrollTo (http://plugins.jquery.com/project/ScrollTo)
- *
- * Todo:
- *  Make batch actions faster
- *  Implement dynamic insertion through remote calls
- */
-
-
-(function($) {
-
-$.widget("ui.multiselect", {
-  options: {
-		sortable: true,
-		dragToAdd: true,
-		searchable: true,
-		doubleClickable: true,
-		animated: 'fast',
-		show: 'slideDown',
-		hide: 'slideUp',
-		dividerLocation: 0.6,
-		selectedContainerOnLeft: true,
-		width: null,
-		height: null,
-		nodeComparator: function(node1,node2) {
-			var text1 = node1.text(),
-			    text2 = node2.text();
-			return text1 == text2 ? 0 : (text1 < text2 ? -1 : 1);
-		},
-		includeRemoveAll: true,
-		includeAddAll: true,
-		pressEnterKeyToAddAll: false
-	},
-	_create: function() {
-		this.element.hide();
-		this.id = this.element.attr("id");
-		this.container = $('<div class="ui-multiselect ui-helper-clearfix ui-widget"></div>').insertAfter(this.element);
-		this.count = 0; // number of currently selected options
-		this.selectedContainer = $('<div class="selected"></div>');
-		if (this.options.selectedContainerOnLeft) {
-			this.selectedContainer.appendTo(this.container);
-			this.availableContainer = $('<div class="available"></div>').appendTo(this.container);
-			this.availableContainer.addClass('right-column');
-		}
-		else
-		{
-			this.availableContainer = $('<div class="available"></div>').appendTo(this.container);
-			this.selectedContainer.appendTo(this.container);
-			this.selectedContainer.addClass('right-column');
-		}
-		this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 '+$.ui.multiselect.locale.itemsCount+'</span>'+(this.options.includeRemoveAll?'<a href="#" class="remove-all">'+$.ui.multiselect.locale.removeAll+'</a>':'<span class="remove-all">&nbsp;</span>')+'</div>').appendTo(this.selectedContainer);
-		this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search empty ui-widget-content ui-corner-all"/>'+(this.options.includeAddAll?'<a href="#" class="add-all">'+$.ui.multiselect.locale.addAll+'</a>':'<span class="add-all">&nbsp;</span>')+'</div>').appendTo(this.availableContainer);
-		this.selectedList = $('<ul class="selected connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
-		this.availableList = $('<ul class="available connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
-
-		var that = this;
-
-		var width = this.options.width;
-		if (!width) {
-			width = this.element.width();
-		}
-		var height = this.options.height;
-		if (!height) {
-			height = this.element.height();
-		}
-
-		// set dimensions
-		this.container.width(width-2);
-		if (this.options.selectedContainerOnLeft) {
-			this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-1);
-			this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-2);
-		}
-		else
-		{
-			this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-2);
-			this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-1);
-		}
-
-		// fix list height to match <option> depending on their individual header's heights
-		this.selectedList.height(Math.max(height-this.selectedActions.height(),1));
-		this.availableList.height(Math.max(height-this.availableActions.height(),1));
-
-		if ( !this.options.animated ) {
-			this.options.show = 'show';
-			this.options.hide = 'hide';
-		}
-
-		// init lists
-		this._populateLists(this.element.find('option'));
-
-		// make selection sortable
-		if (this.options.sortable) {
-			this.selectedList.sortable({
-				placeholder: 'ui-state-highlight',
-				axis: 'y',
-				update: function(event, ui) {
-					// apply the new sort order to the original selectbox
-					that.selectedList.find('li').each(function() {
-						if ($(this).data('optionLink'))
-							$(this).data('optionLink').remove().appendTo(that.element);
-					});
-				},
-				beforeStop: function (event, ui) {
-					// This lets us recognize which item was just added to
-					// the list in receive, per the workaround for not being
-					// able to reference the new element.
-					ui.item.addClass('dropped');
-				},
-				receive: function(event, ui) {
-					ui.item.data('optionLink').attr('selected', true);
-					// increment count
-					that.count += 1;
-					that._updateCount();
-					// workaround, because there's no way to reference
-					// the new element, see http://dev.jqueryui.com/ticket/4303
-					that.selectedList.children('.dropped').each(function() {
-						$(this).removeClass('dropped');
-						$(this).data('optionLink', ui.item.data('optionLink'));
-						$(this).data('idx', ui.item.data('idx'));
-						that._applyItemState($(this), true);
-					});
-
-					// workaround according to http://dev.jqueryui.com/ticket/4088
-					setTimeout(function() { ui.item.remove(); }, 1);
-				},
-				stop: function (event, ui) { that.element.change(); }
-			});
-		}
-
-		// set up livesearch
-		if (this.options.searchable) {
-			this._registerSearchEvents(this.availableContainer.find('input.search'));
-		} else {
-			$('.search').hide();
-		}
-
-		// batch actions
-		this.container.find(".remove-all").click(function() {
-			that._populateLists(that.element.find('option').removeAttr('selected'));
-			that.element.trigger('change');
-			return false;
-		});
-
-		this.container.find(".add-all").click(function() {
-			var options = that.element.find('option').not(":selected");
-			if (that.availableList.children('li:hidden').length > 1) {
-				that.availableList.children('li').each(function(i) {
-					if ($(this).is(":visible")) $(options[i-1]).attr('selected', 'selected');
-				});
-			} else {
-				options.attr('selected', 'selected');
-			}
-			that._populateLists(that.element.find('option'));
-			that.element.trigger('change');
-			if (that.options.pressEnterKeyToAddAll) {
-                    //clear input after add all
-                    $('input.search').val("");
-                }
-			
-			return false;
-		});
-	},
-	destroy: function() {
-		this.element.show();
-		this.container.remove();
-
-		$.Widget.prototype.destroy.apply(this, arguments);
-	},
-	addOption: function(option) {
-		// Append the option
-		option = $(option);
-		var select = this.element;
-		select.append(option);
-
-		var item = this._getOptionNode(option).appendTo(option.attr('selected') ? this.selectedList : this.availableList).show();
-
-		if (option.attr('selected')) {
-			this.count += 1;
-		}
-		this._applyItemState(item, option.attr('selected'));
-		item.data('idx', this.count);
-
-		// update count
-		this._updateCount();
-		this._filter.apply(this.availableContainer.find('input.search'), [this.availableList]);
-	},
-    // Redisplay the lists of selected/available options.
-    // Call this after you've selected/unselected some options programmatically.
-    // GRIPE This is O(n) where n is the length of the list - seems like
-    // there must be a smarter way of doing this, but I have not been able
-    // to come up with one. I see no way to detect programmatic setting of
-    // the option's selected property, and without that, it seems like we
-    // can't have a general-case listener that does its thing every time an
-    // option is selected.
-    refresh: function() {
-		// Redisplay our lists.
-		this._populateLists(this.element.find('option'));
-    },
-	_populateLists: function(options) {
-		this.selectedList.children('.ui-element').remove();
-		this.availableList.children('.ui-element').remove();
-		this.count = 0;
-
-		var that = this;
-		var groups = $(this.element).find("optgroup").map(function(i) {
-			return that._getOptionGroup($(this));
-		});
-		groups.appendTo(this.selectedList.add(this.availableList));
-		
-		var items = $(options.map(function(i) {
-		  var item = that._getOptionNode(this).appendTo(that._getOptionList(this)).show();
-
-			if (this.selected) that.count += 1;
-			that._applyItemState(item, this.selected);
-			item.data('idx', i);
-			return item[0];
-    }));
-
-		// update count
-		this._updateCount();
-		that._filter.apply(this.availableContainer.find('input.search'), [that.availableList]);
-  },
-	_getOptionList: function(option) {
-		var selected = option.selected;
-		option = $(option);
-		var $list = selected ? this.selectedList : this.availableList;
-		var $group = option.closest("optgroup");
-		if ($group.length === 0) {
-			return $list;
-		} else {
-			var $groupList = $list.find("ul[title='" + $group.attr("label") + "']");
-			if ($groupList.length === 0) {
-				$groupList = $("<ul class='ui-state-default ui-element available' title='" + $group.attr("label") + "'>" + $group.attr("label") + "</ul>").appendTo($list);
-			}
-			$groupList.show();
-			return $groupList;
-		}
-	},
-	_getOptionGroup : function(optgroup) {
-		var groupNode = $("<ul class='ui-state-default ui-element available' title='" + optgroup.attr("label") + "'>" + optgroup.attr("label") + "</ul>").hide();
-		return groupNode[0];
-	},
-	_updateCount: function() {
-		this.selectedContainer.find('span.count').text(this.count+" "+$.ui.multiselect.locale.itemsCount);
-	},
-	_getOptionNode: function(option) {
-		option = $(option);
-		var node = $('<li class="ui-state-default ui-element" title="'+option.text()+'"><span class="ui-icon"/>'+option.text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
-		node.data('optionLink', option);
-		return node;
-	},
-	// clones an item with associated data
-	// didn't find a smarter away around this
-	_cloneWithData: function(clonee) {
-		var clone = clonee.clone(false,false);
-		clone.data('optionLink', clonee.data('optionLink'));
-		clone.data('idx', clonee.data('idx'));
-		return clone;
-	},
-	_setSelected: function(item, selected) {
-		var temp = item.data('optionLink').attr('selected', selected);
-		var parent = temp.parent();
-		temp.detach().appendTo(parent);
-		this.element.trigger('change');
-
-		if (selected) {
-			var selectedItem = this._cloneWithData(item);
-			item[this.options.hide](this.options.animated, function() { 
-				if (item.siblings().length === 0) {
-					item.closest("ul[title]").hide();
-				}
-				$(this).remove(); 
-			});
-			// get group to add it to...
-			var $list = this._getOptionList(selectedItem.data("optionLink")[0]);
-			selectedItem.appendTo($list).hide()[this.options.show](this.options.animated);
-
-			this._applyItemState(selectedItem, true);
-			return selectedItem;
-		} else {
-
-			// look for successor based on initial option index
-			var items = this.availableList.find('li'), comparator = this.options.nodeComparator;
-			var succ = null, i = item.data('idx'), direction = comparator(item, $(items[i]));
-
-			// TODO: test needed for dynamic list populating
-			if ( direction ) {
-				while (i>=0 && i<items.length) {
-					direction > 0 ? i++ : i--;
-					if ( direction != comparator(item, $(items[i])) ) {
-						// going up, go back one item down, otherwise leave as is
-						succ = items[direction > 0 ? i : i+1];
-						var group1 = item.closest("ul[title]"),
-							group2 = $(succ).closest("ul[title]");
-						if (group1.length !== 0 && group2.length !== 0) {
-							if (group1.attr("title") !== group2.attr("title")) {
-								succ = null;
-							}
-						}
-						break;
-					}
-				}
-			} else {
-				succ = items[i];
-			}
-
-			var availableItem = this._cloneWithData(item);
-			var $list = this._getOptionList(availableItem.data("optionLink")[0]);
-			succ ? availableItem.insertBefore($(succ)) : availableItem.appendTo($list);
-			item[this.options.hide](this.options.animated, function() { 
-				if (item.siblings().length === 0) {
-					item.closest("ul[title]").hide();
-				}
-				$(this).remove(); 
-			});
-			availableItem.hide()[this.options.show](this.options.animated);
-
-			this._applyItemState(availableItem, false);
-			return availableItem;
-		}
-	},
-	_applyItemState: function(item, selected) {
-		if (selected) {
-			if (this.options.sortable)
-				item.children('span').addClass('ui-icon-arrowthick-2-n-s').removeClass('ui-helper-hidden').addClass('ui-icon');
-			else
-				item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-minus').removeClass('ui-icon-plus');
-			this._registerRemoveEvents(item.find('a.action'));
-
-		} else {
-			item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-plus').removeClass('ui-icon-minus');
-			this._registerAddEvents(item.find('a.action'));
-		}
-
-		this._registerDoubleClickEvents(item);
-		this._registerHoverEvents(item);
-	},
-	// taken from John Resig's liveUpdate script
-	_filter: function(list) {
-		var input = $(this);
-		var rows = list.find('li'),
-			cache = rows.map(function(){
-
-				return $(this).text().toLowerCase();
-			});
-
-		var term = $.trim(input.val().toLowerCase()), scores = [];
-
-		if (!term) {
-			rows.show();
-		} else {
-			rows.hide();
-
-			cache.each(function(i) {
-				if (this.indexOf(term)>-1) { scores.push(i); }
-			});
-
-			$.each(scores, function() {
-				$(rows[this]).show();
-			});
-		}
-	},
-	_registerDoubleClickEvents: function(elements) {
-		if (!this.options.doubleClickable) return;
-		elements.dblclick(function() {
-			elements.find('a.action').click();
-		});
-	},
-	_registerHoverEvents: function(elements) {
-		elements.removeClass('ui-state-hover');
-		elements.mouseover(function() {
-			$(this).addClass('ui-state-hover');
-		});
-		elements.mouseout(function() {
-			$(this).removeClass('ui-state-hover');
-		});
-	},
-	_registerAddEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			var item = that._setSelected($(this).parent(), true);
-			that.count += 1;
-			that._updateCount();
-
-			// Prevent extra clicks from triggering bogus add events, if a user
-			// tries clicking during the removal process.
-			$(this).unbind('click');
-
-			return false;
-		});
-
-		// make draggable
-		if (this.options.sortable && this.options.dragToAdd) {
-  		elements.each(function() {
-  			$(this).parent().draggable({
-  	      connectToSortable: that.selectedList,
-  				helper: function() {
-  					var selectedItem = that._cloneWithData($(this)).width($(this).width() - 50);
-  					selectedItem.width($(this).width());
-  					return selectedItem;
-  				},
-  				appendTo: that.container,
-  				containment: that.container,
-  				revert: 'invalid'
-  	    });
-  		});
-		}
-	},
-	_registerRemoveEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			that._setSelected($(this).parent(), false);
-			that.count -= 1;
-			that._updateCount();
-
-			// Prevent extra clicks from triggering bogus remove events, if a
-			// user tries clicking during the removal process.
-			$(this).unbind('click');
-
-			return false;
-		});
- 	},
-	_registerSearchEvents: function(input) {
-		var that = this;
-
-		input.focus(function() {
-			$(this).addClass('ui-state-active');
-		})
-		.blur(function() {
-			$(this).removeClass('ui-state-active');
-		})
-		.keypress(function(e) {
-			if (e.keyCode == 13) {
-				if (that.options.pressEnterKeyToAddAll) {
-		            //on Enter, if a filter is present add all, then clear the input
-		            var str = $('input.search').val();
-		            if (str !== undefined && str !== null && str !== "") {
-		                $('a.add-all').click();
-		                $('input.search').val("");
-		            }
-		        }
-				return false;
-			}
-		})
-		.keyup(function() {
-			that._filter.apply(this, [that.availableList]);
-		});
-	}
-});
-
-$.extend($.ui.multiselect, {
-	locale: {
-		addAll:'Add all',
-		removeAll:'Remove all',
-		itemsCount:'items selected'
-	}
-});
-
-
-})(jQuery);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fa6b503caa7..6698866869e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1015,10 +1015,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 //print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/ColVis/css/ColVisAlt.css'.($ext?'?'.$ext:'').'" />'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/css/TableTools.css'.($ext?'?'.$ext:'').'" />'."\n";
             }
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))     // jQuery multiselect
+            if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && $conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiselect') || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT') == 'multiselect'))     // jQuery multiselect
             {
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/css/ui.multiselect.css'.($ext?'?'.$ext:'').'" />'."\n";
             }
+            if ((! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && $conf->global->MAIN_USE_JQUERY_MULTISELECT == 'multiple-select') || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT') == 'multiple-select'))     // jQuery multiple-select
+            {
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiple-select/multiple-select.css'.($ext?'?'.$ext:'').'" />'."\n";
+            }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
@@ -1178,11 +1182,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/ColVis/js/ColVis.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/js/TableTools.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            // jQuery Multiselect
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/js/ui.multiselect.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {