From 6b5b10fc949fd04451a595a59cb14c33beca904c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 16:28:34 +0200
Subject: [PATCH 1/9] FIX #7224

---
 htdocs/product/class/productcustomerprice.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 5b9050077c9..b3066df8188 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -169,12 +169,12 @@ class Productcustomerprice extends CommonObject
 		$sql .= " " . (empty($this->price_min_ttc) ? '0' : "'" . $this->price_min_ttc . "'") . ",";
 		$sql .= " " . (! isset($this->price_base_type) ? 'NULL' : "'" . $this->db->escape($this->price_base_type) . "'") . ",";
 		$sql .= " ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : "'" . $this->tva_tx . "'") . ",";
+		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : (empty($this->tva_tx)?0:$this->tva_tx)) . ",";
 		$sql .= " " . (! isset($this->recuperableonly) ? 'NULL' : "'" . $this->recuperableonly . "'") . ",";
 		$sql .= " " . (empty($this->localtax1_type) ? "'0'" : "'" . $this->localtax1_type . "'") . ",";
-		$sql .= " " . (! isset($this->localtax1_tx) ? 'NULL' : "'" . $this->localtax1_tx . "'") . ",";
+		$sql .= " " . (! isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx)?0:$this->localtax1_tx)) . ",";
 		$sql .= " " . (empty($this->localtax2_type) ? "'0'" : "'" . $this->localtax2_type . "'") . ",";
-		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : "'" . $this->localtax2_tx . "'") . ",";
+		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx)?0:$this->localtax2_tx)) . ",";
 		$sql .= " " . $user->id . ",";
 		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . "";
 		$sql .= ")";
@@ -656,10 +656,10 @@ class Productcustomerprice extends CommonObject
 		$sql .= " price_min_ttc=" . (isset($this->price_min_ttc) ? $this->price_min_ttc : "null") . ",";
 		$sql .= " price_base_type=" . (isset($this->price_base_type) ? "'" . $this->db->escape($this->price_base_type) . "'" : "null") . ",";
 		$sql .= " default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " tva_tx=" . (isset($this->tva_tx) ? $this->tva_tx : "null") . ",";
+		$sql .= " tva_tx=" . (isset($this->tva_tx) ? (empty($this->tva_tx)?0:$this->tva_tx) : "null") . ",";
 		$sql .= " recuperableonly=" . (isset($this->recuperableonly) ? $this->recuperableonly : "null") . ",";
-		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? $this->localtax1_tx : "null") . ",";
-		$sql .= " localtax2_tx=" . (isset($this->localtax2_tx) ? $this->localtax2_tx : "null") . ",";
+		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? (empty($this->localtax1_tx)?0:$this->localtax1_tx) : "null") . ",";
+		$sql .= " localtax2_tx=" . (isset($this->localtax2_tx) ? (empty($this->localtax2_tx)?0:$this->localtax2_tx) : "null") . ",";
 		$sql .= " localtax1_type=" . (! empty($this->localtax1_type) ? "'".$this->localtax1_type."'": "'0'") . ",";
 		$sql .= " localtax2_type=" . (! empty($this->localtax2_type) ? "'".$this->localtax2_type."'": "'0'") . ",";
 		$sql .= " fk_user=" . $user->id . ",";

From 947acfffe204575feeee6eb5bb38cd88bd09424a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 16:53:29 +0200
Subject: [PATCH 2/9] FIX #7173

---
 htdocs/adherents/subscription.php | 52 +++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..c7904667846 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -113,7 +113,6 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 		if ($result < 0)
 		{
 			$langs->load("errors");
-			$errmsg=$langs->trans($company->error);
 			setEventMessages($company->error, $company->errors, 'errors');
 		}
 		else
@@ -123,7 +122,7 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 	}
 	else
 	{
-		$errmsg=$object->error;
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -211,7 +210,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     {
         $paymentdate=dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
     }
-    $subscription=$_POST["subscription"];	// Amount of subscription
+    $subscription=price2num(GETPOST("subscription",'alpha'));	// Amount of subscription
     $label=$_POST["label"];
 
     // Payment informations
@@ -229,6 +228,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         $error++;
         $langs->load("errors");
         $errmsg=$langs->trans("ErrorBadDateFormat",$langs->transnoentitiesnoconv("DateSubscription"));
+        setEventMessages($errmsg, null, 'errors');
         $action='addsubscription';
     }
     if (GETPOST('end') && ! $datesubend)
@@ -236,6 +236,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         $error++;
         $langs->load("errors");
         $errmsg=$langs->trans("ErrorBadDateFormat",$langs->transnoentitiesnoconv("DateEndSubscription"));
+        setEventMessages($errmsg, null, 'errors');
         $action='addsubscription';
     }
     if (! $datesubend)
@@ -246,16 +247,20 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     {
         $error++;
         $errmsg=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
+        setEventMessages($errmsg, null, 'errors');
         $action='addsubscription';
     }
 
+    $amount = price2num(GETPOST("subscription",'alpha'));
+
     // Check if a payment is mandatory or not
     if (! $error && $adht->subscription)	// Member type need subscriptions
     {
-        if (! is_numeric($_POST["subscription"]))
+        if (! is_numeric($amount))
         {
             // If field is '' or not a numeric value
             $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"));
+        	setEventMessages($errmsg, null, 'errors');
             $error++;
             $action='addsubscription';
         }
@@ -273,7 +278,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 {
                     if ($_POST["accountid"])   $errmsg=$langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
-                if ($errmsg) $action='addsubscription';
+                if ($errmsg)
+                {
+        			setEventMessages($errmsg, null, 'errors');
+                	$action='addsubscription';
+                }
             }
         }
     }
@@ -319,6 +328,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                         {
                             $error++;
                             $errmsg=$db->lasterror();
+        					setEventMessages($errmsg, null, 'errors');
                         }
                     }
                     else
@@ -326,14 +336,16 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                         $error++;
                         $errmsg=$acct->error;
                         $errmsgs=$acct->errors;
-                    }
+        				setEventMessages($errmsg, $errmsgs, 'errors');
+					}
                 }
                 else
 				{
                     $error++;
                     $errmsg=$acct->error;
                     $errmsgs=$acct->errors;
-                }
+        			setEventMessages($errmsg, $errmsgs, 'errors');
+				}
             }
 
             // If option choosed, we create invoice
@@ -351,6 +363,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 	{
                 		$langs->load("errors");
                 		$errmsg=$langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
+        				setEventMessages($errmsg, null, 'errors');
                 		$error++;
                 	}
                 }
@@ -361,6 +374,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                {
 	                    $errmsg=$customer->error;
 	                    $errmsgs=$acct->errors;
+        				setEventMessages($errmsg, $errmsgs, 'errors');
 	                    $error++;
 	                }
                 }
@@ -378,6 +392,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                    {
 	                        $error++;
 	                        $errmsg='ErrorNoPaymentTermRECEPFound';
+        					setEventMessages($errmsg, null, 'errors');
 	                    }
 	                }
 	                $invoice->socid=$object->fk_soc;
@@ -389,12 +404,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                {
 	                    $invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
 	                }
-	                 
+
 	                $result=$invoice->create($user);
 	                if ($result <= 0)
 	                {
 	                    $errmsg=$invoice->error;
 	                    $errmsgs=$invoice->errors;
+        				setEventMessages($errmsg, $errmsgs, 'errors');
 	                    $error++;
 	                }
                 }
@@ -415,6 +431,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                if ($result <= 0)
 	                {
 	                    $errmsg=$invoice->error;
+        				setEventMessages($errmsg, null, 'errors');
 	                    $error++;
 	                }
                 }
@@ -427,6 +444,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                {
 	                    $errmsg=$invoice->error;
 	                    $errmsgs=$invoice->errors;
+        				setEventMessages($errmsg, $errmsgs, 'errors');
 	                    $error++;
 	                }
                 }
@@ -454,6 +472,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                         {
                             $errmsg=$paiement->error;
                             $errmsgs=$paiement->errors;
+        					setEventMessages($errmsg, $errmsgs, 'errors');
                             $error++;
                         }
                     }
@@ -535,6 +554,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 if ($result < 0)
                 {
                 	$errmsg=$object->error;
+        			setEventMessages($errmsg, null, 'errors');
                 }
             }
 
@@ -581,12 +601,12 @@ if ($rowid > 0)
     dol_fiche_head($head, 'subscription', $langs->trans("Member"), 0, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'rowid', $linkback);
-    
+
     print '<div class="fichecenter">';
     print '<div class="fichehalfleft">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border" width="100%">';
 
@@ -624,13 +644,13 @@ if ($rowid > 0)
 	}
 
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright"><div class="ficheaddleft">';
-   
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
-	
+
 	// Birthday
 	print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 
@@ -677,7 +697,7 @@ if ($rowid > 0)
 	    }
 	}
 	print '</td></tr>';
-	
+
 	// Third party Dolibarr
 	if (! empty($conf->societe->enabled))
 	{
@@ -752,7 +772,7 @@ if ($rowid > 0)
 
 	print "</div></div></div>\n";
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     print '</form>';

From 1b1d1a8d0b093f0bc34d717acce479048afea69e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 16:57:07 +0200
Subject: [PATCH 3/9] FIX #7156

---
 htdocs/societe/soc.php | 55 ++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b9c962a5168..06846d34203 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -140,7 +140,7 @@ if (empty($reshook))
 			if (!$errors)
 			{
 			    // TODO Move the merge function into class of object.
-			    
+
 				$db->begin();
 
 				// Recopy some data
@@ -157,26 +157,29 @@ if (empty($reshook))
 				{
 				    if (empty($object->$property)) $object->$property = $soc_origin->$property;
 				}
-				
+
 				// Concat some data
 				$listofproperties=array(
-				    'note_public', 'note_private' 
+				    'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
 				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
-				
+
 				// Merge extrafields
-				foreach ($soc_origin->array_options as $key => $val)
+				if (is_array($soc_origin->array_options))
 				{
-				    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+					foreach ($soc_origin->array_options as $key => $val)
+					{
+					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+					}
 				}
 
 				// TODO Merge categories
 				$object->update($object->id, $user);
-				
-				// Move links 
+
+				// Move links
 				$objects = array(
 					'Adherent' => '/adherents/class/adherent.class.php',
 					'Societe' => '/societe/class/societe.class.php',
@@ -487,7 +490,7 @@ if (empty($reshook))
                 if (empty($object->fournisseur)) $object->code_fournisseur='';
 
                 $result = $object->create($user);
-                
+
 				if ($result >= 0)
                 {
                     if ($object->particulier)
@@ -557,7 +560,7 @@ if (empty($reshook))
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
-					
+
                     $error=$object->error; $errors=$object->errors;
                 }
 
@@ -852,7 +855,7 @@ else
         $object->particulier		= $private;
         $object->prefix_comm		= GETPOST('prefix_comm');
         $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
-        
+
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
@@ -860,7 +863,7 @@ else
 		else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
-		
+
         $object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
         $object->address			= GETPOST('address', 'alpha');
         $object->zip				= GETPOST('zipcode', 'alpha');
@@ -1136,7 +1139,7 @@ else
 	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
         print '<tr><td>'.fieldLabel('Web','url').'</td>';
 	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
-	    
+
         // Skype
         if (! empty($conf->skype->enabled))
         {
@@ -1216,7 +1219,7 @@ else
             print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
-        
+
         }
         elseif($mysoc->localtax1_assuj=="1")
         {
@@ -1230,7 +1233,7 @@ else
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
         }
-        
+
         // Type - Size
         print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
         $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
@@ -1751,7 +1754,7 @@ else
                     $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
                     print '</span>';
                 }
-            
+
                 print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
@@ -1761,7 +1764,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
@@ -1774,7 +1777,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
@@ -1788,7 +1791,7 @@ else
                 }
                 print '</td></tr>';
             }
-            
+
             // VAT Code
             print '<tr><td>'.fieldLabel('VATIntra','intra_vat').'</td>';
             print '<td colspan="3">';
@@ -2090,7 +2093,7 @@ else
 		    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
 		    print yn($object->localtax2_assuj);
 		    print '</td></tr>';
-		
+
 		    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
 		    {
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
@@ -2144,7 +2147,7 @@ else
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
@@ -2154,7 +2157,7 @@ else
 		    print '</td></tr>';
 		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
 		    {
-		
+
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 		        print '<input type="hidden" name="action" value="set_localtax2">';
 		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -2167,7 +2170,7 @@ else
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		/*
@@ -2178,7 +2181,7 @@ else
 		 print '</td><tr>';
 		 }
 		 */
-		
+
         // VAT Code
         print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
@@ -2573,10 +2576,10 @@ else
 
 	        // Subsidiaries list
 	        if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-	        {	        
+	        {
 	           $result=show_subsidiaries($conf,$langs,$db,$object);
 	        }
-	        
+
 	        // Contacts list
 	        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 	        {

From 9079d2890c429ac8012a70a3546f238d1330e1b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 18:13:42 +0200
Subject: [PATCH 4/9] Fix ajout du code devise Franc Pacifique

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index d9b1390bb32..cb34f60291f 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -154,7 +154,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VEF'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VND', '[8363]', 1,				'Viet Nam Dong');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XAF', NULL, 1,					'Communaute Financiere Africaine (BEAC) CFA Franc');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XOF', NULL, 1,					'Communaute Financiere Africaine (BCEAO) Franc');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', NULL, 1,                   'Franc pacifique (XPF)');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', '[70]', 1,                'Franc pacifique (XPF)');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'YER', '[65020]', 1,				'Yemen Rial');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZWD', '[90,36]', 1,				'Zimbabwe Dollar');
 

From ccb5344d32b803dd8abb02d27e2888f856f24612 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 18:52:03 +0200
Subject: [PATCH 5/9] Fix links

---
 htdocs/core/boxes/box_activity.php            | 494 +++++++++---------
 .../install/mysql/data/llx_c_currencies.sql   |   2 +-
 2 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index ae3e270101e..02b1d1880c8 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -97,181 +97,95 @@ class box_activity extends ModeleBoxes
 
         $cumuldata = array();
 
-        // list the summary of the bills
-        if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+
+        // list the summary of the propals
+        if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
         {
-            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $facturestatic=new Facture($db);
+        	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+        	$propalstatic=new Propal($db);
 
-            // part 1
-            $cachedir = DOL_DATA_ROOT.'/facture/temp';
-            $filename = '/boxactivity-invoice'.$fileid;
+        	$cachedir = DOL_DATA_ROOT.'/propale/temp';
+        	$filename = '/boxactivity-propal'.$fileid;
+        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+        	$data = array();
+        	if ($refresh)
+        	{
+        		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
+        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        		$sql.= ")";
+        		$sql.= " WHERE p.entity = ".$conf->entity;
+        		$sql.= " AND p.fk_soc = s.rowid";
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        		$sql.= " AND p.datep >= '".$db->idate($tmpdate)."'";
+        		$sql.= " AND p.date_cloture IS NULL"; // just unclosed
+        		$sql.= " GROUP BY p.fk_statut";
+        		$sql.= " ORDER BY p.fk_statut DESC";
 
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-            $data = array();
-            if ($refresh)
-            {
-                $sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-                $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql.= ")";
-                $sql.= " WHERE f.entity = ".$conf->entity;
-                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-                if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-                $sql.= " AND f.fk_soc = s.rowid";
-                $sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND paye=1";
-                $sql.= " GROUP BY f.fk_statut";
-                $sql.= " ORDER BY f.fk_statut DESC";
+        		$result = $db->query($sql);
+        		if ($result)
+        		{
+        			$num = $db->num_rows($result);
 
-                $result = $db->query($sql);
-                if ($result) {
-                    $num = $db->num_rows($result);
-                    $j=0;
-                    while ($j < $num) {
-                        $data[$j]=$db->fetch_object($result);
-                        $j++;
-                    }
-                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $db->free($result);
-                } else {
-                    dol_print_error($db);
-                }
-            } else {
-                $data = dol_readcachefile($cachedir, $filename);
-            }
+        			$j=0;
+        			while ($j < $num) {
+        				$data[$j]=$db->fetch_object($result);
+        				$j++;
+        			}
+        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        				dol_filecache($cachedir, $filename, $data);
+        			}
+        			$db->free($result);
+        		} else {
+        			dol_print_error($db);
+        		}
+        	}
+        	else
+        	{
+        		$data = dol_readcachefile($cachedir, $filename);
+        	}
 
-            $cumuldata=array_merge($cumuldata, $data);
-            if (! empty($data)) {
-                $j=0;
-                while ($line < count($cumuldata)) {
-                    $billurl="viewstatut=2&amp;paye=1&amp;year=".$data[$j]->annee;
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-                    );
+        	$cumuldata=array_merge($cumuldata, $data);
+        	if (! empty($data))
+        	{
+        		$j=0;
+        		while ($line < count($cumuldata))
+        		{
+        			$this->info_box_contents[$line][0] = array(
+        			'td' => 'align="left" width="16"',
+        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			'logo' => 'object_propal'
+        			);
 
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
-                    );
+        			$this->info_box_contents[$line][1] = array(
+        			'td' => '',
+        			'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			);
 
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
-                        'text' => $data[$j]->nb,
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                    );
+        			$this->info_box_contents[$line][2] = array(
+        			'td' => 'class="right"',
+        			'text' => $data[$j]->nb,
+        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+        			);
+        			$totalnb += $data[$j]->nb;
 
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
-                        'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
-                    );
+        			$this->info_box_contents[$line][3] = array(
+        			'td' => 'class="right"',
+        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+        			);
+        			$totalMnt += $data[$j]->Mnttot;
+        			$this->info_box_contents[$line][4] = array(
+        			'td' => 'align="right" width="18"',
+        			'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
+        			);
 
-                    // We add only for the current year
-                    if ($data[$j]->annee == date("Y")) {
-                        $totalnb += $data[$j]->nb;
-                        $totalMnt += $data[$j]->Mnttot;
-                    }
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
-                    );
-                    $line++;
-                    $j++;
-                }
-                if (count($data)==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-            }
-
-            // part 2
-            $cachedir = DOL_DATA_ROOT.'/facture/temp';
-            $filename = '/boxactivity-invoice2'.$fileid;
-
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-
-            if ($refresh) {
-                $sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-                $sql.= " WHERE f.entity = ".$conf->entity;
-                $sql.= " AND f.fk_soc = s.rowid";
-                $sql.= " AND paye=0";
-                $sql.= " GROUP BY f.fk_statut";
-                $sql.= " ORDER BY f.fk_statut DESC";
-
-                $result = $db->query($sql);
-                if ($result) {
-                    $num = $db->num_rows($result);
-                    $j=0;
-                    while ($j < $num) {
-                        $data[$j]=$db->fetch_object($result);
-                        $j++;
-                    }
-                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $db->free($result);
-                } else {
-                    dol_print_error($db);
-                }
-            } else {
-                $data = dol_readcachefile($cachedir, $filename);
-            }
-
-            $cumuldata=array_merge($cumuldata, $data);
-            if (! empty($data)) {
-                $j=0;
-
-                while ($line < count($cumuldata)) {
-                    $billurl="viewstatut=".$data[$j]->fk_statut."&amp;paye=0";
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-                    );
-
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-                    );
-
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                    );
-                    $totalnb += $data[$j]->nb;
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
-                        'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
-                    );
-                    $totalMnt += $objp->Mnttot;
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3),
-                    );
-                    $line++;
-                    $j++;
-                }
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
-                );
-            }
+        			$line++;
+        			$j++;
+        		}
+        	}
         }
 
         // list the summary of the orders
@@ -295,12 +209,10 @@ class box_activity extends ModeleBoxes
                 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
                 if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
                 $sql.= " AND c.date_commande >= '".$db->idate($tmpdate)."'";
-                $sql.= " AND c.facture=0";
                 $sql.= " GROUP BY c.fk_statut";
                 $sql.= " ORDER BY c.fk_statut DESC";
 
                 $result = $db->query($sql);
-
                 if ($result) {
                     $num = $db->num_rows($result);
                     $j=0;
@@ -359,94 +271,182 @@ class box_activity extends ModeleBoxes
             }
         }
 
-        // list the summary of the propals
-        if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+
+        // list the summary of the bills
+        if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
         {
-            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-            $propalstatic=new Propal($db);
+        	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+        	$facturestatic=new Facture($db);
 
-            $cachedir = DOL_DATA_ROOT.'/propale/temp';
-            $filename = '/boxactivity-propal'.$fileid;
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-            $data = array();
-            if ($refresh)
-            {
-                $sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-                $sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql.= ")";
-                $sql.= " WHERE p.entity = ".$conf->entity;
-                $sql.= " AND p.fk_soc = s.rowid";
-                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-                if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-                $sql.= " AND p.datep >= '".$db->idate($tmpdate)."'";
-                $sql.= " AND p.date_cloture IS NULL"; // just unclosed
-                $sql.= " GROUP BY p.fk_statut";
-                $sql.= " ORDER BY p.fk_statut DESC";
+        	// part 1
+        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
+        	$filename = '/boxactivity-invoice'.$fileid;
 
-                $result = $db->query($sql);
-                if ($result)
-                {
-                    $num = $db->num_rows($result);
+        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+        	$data = array();
+        	if ($refresh)
+        	{
+        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        		$sql.= ")";
+        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+        		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        		$sql.= " AND f.fk_soc = s.rowid";
+        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND paye=1";
+        		$sql.= " GROUP BY f.fk_statut";
+        		$sql.= " ORDER BY f.fk_statut DESC";
 
-                    $j=0;
-                    while ($j < $num) {
-                        $data[$j]=$db->fetch_object($result);
-                        $j++;
-                    }
-                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $db->free($result);
-                } else {
-                    dol_print_error($db);
-                }
-            }
-            else
-			{
-                $data = dol_readcachefile($cachedir, $filename);
-            }
+        		$result = $db->query($sql);
+        		if ($result) {
+        			$num = $db->num_rows($result);
+        			$j=0;
+        			while ($j < $num) {
+        				$data[$j]=$db->fetch_object($result);
+        				$j++;
+        			}
+        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        				dol_filecache($cachedir, $filename, $data);
+        			}
+        			$db->free($result);
+        		} else {
+        			dol_print_error($db);
+        		}
+        	} else {
+        		$data = dol_readcachefile($cachedir, $filename);
+        	}
 
-            $cumuldata=array_merge($cumuldata, $data);
-            if (! empty($data))
-            {
-                $j=0;
-                while ($line < count($cumuldata))
-                {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-                        'logo' => 'object_propal'
-                    );
+        	$cumuldata=array_merge($cumuldata, $data);
+        	if (! empty($data)) {
+        		$j=0;
+        		while ($line < count($cumuldata)) {
+        			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+        			$this->info_box_contents[$line][0] = array(
+        			'td' => 'align="left" width="16"',
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+        			'logo' => 'bill',
+        			);
 
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-                    );
+        			$this->info_box_contents[$line][1] = array(
+        			'td' => '',
+        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
+        			);
 
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-                    );
-                    $totalnb += $data[$j]->nb;
+        			$this->info_box_contents[$line][2] = array(
+        			'td' => 'class="right"',
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+        			'text' => $data[$j]->nb,
+        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+        			);
 
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
-                        'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
-                    );
-                    $totalMnt += $data[$j]->Mnttot;
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
-                    );
+        			$this->info_box_contents[$line][3] = array(
+        			'td' => 'class="right"',
+        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
+        			);
 
-                    $line++;
-                    $j++;
-                }
-            }
+        			// We add only for the current year
+        			if ($data[$j]->annee == date("Y")) {
+        				$totalnb += $data[$j]->nb;
+        				$totalMnt += $data[$j]->Mnttot;
+        			}
+        			$this->info_box_contents[$line][4] = array(
+        			'td' => 'align="right" width="18"',
+        			'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
+        			);
+        			$line++;
+        			$j++;
+        		}
+        		if (count($data)==0)
+        			$this->info_box_contents[$line][0] = array(
+        			'td' => 'align="center"',
+        			'text'=>$langs->trans("NoRecordedInvoices"),
+        			);
+        	}
+
+        	// part 2
+        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
+        	$filename = '/boxactivity-invoice2'.$fileid;
+
+        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+
+        	if ($refresh) {
+        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+        		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		$sql.= " AND f.fk_soc = s.rowid";
+        		$sql.= " AND paye=0";
+        		$sql.= " GROUP BY f.fk_statut";
+        		$sql.= " ORDER BY f.fk_statut DESC";
+
+        		$result = $db->query($sql);
+        		if ($result) {
+        			$num = $db->num_rows($result);
+        			$j=0;
+        			while ($j < $num) {
+        				$data[$j]=$db->fetch_object($result);
+        				$j++;
+        			}
+        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        				dol_filecache($cachedir, $filename, $data);
+        			}
+        			$db->free($result);
+        		} else {
+        			dol_print_error($db);
+        		}
+        	} else {
+        		$data = dol_readcachefile($cachedir, $filename);
+        	}
+
+        	$cumuldata=array_merge($cumuldata, $data);
+        	if (! empty($data)) {
+        		$j=0;
+
+        		while ($line < count($cumuldata)) {
+        			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
+        			$this->info_box_contents[$line][0] = array(
+        			'td' => 'align="left" width="16"',
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+        			'logo' => 'bill',
+        			);
+
+        			$this->info_box_contents[$line][1] = array(
+        			'td' => '',
+        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			);
+
+        			$this->info_box_contents[$line][2] = array(
+        			'td' => 'class="right"',
+        			'text' => $data[$j]->nb,
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+        			);
+        			$totalnb += $data[$j]->nb;
+        			$this->info_box_contents[$line][3] = array(
+        			'td' => 'class="right"',
+        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+        			);
+        			$totalMnt += $objp->Mnttot;
+        			$this->info_box_contents[$line][4] = array(
+        			'td' => 'align="right" width="18"',
+        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3),
+        			);
+        			$line++;
+        			$j++;
+        		}
+        		if ($num==0)
+        			$this->info_box_contents[$line][0] = array(
+        			'td' => 'align="center"',
+        			'text'=>$langs->trans("NoRecordedInvoices"),
+        			);
+        	} else {
+        		$this->info_box_contents[0][0] = array(
+        		'td' => '',
+        		'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
+        		);
+        	}
         }
 
 		// Add the sum in the bottom of the boxes
diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index cb34f60291f..db1ba19aa6e 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -154,7 +154,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VEF'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'VND', '[8363]', 1,				'Viet Nam Dong');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XAF', NULL, 1,					'Communaute Financiere Africaine (BEAC) CFA Franc');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XOF', NULL, 1,					'Communaute Financiere Africaine (BCEAO) Franc');
-INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', '[70]', 1,                'Franc pacifique (XPF)');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'XPF', '[70]', 1,                'Franc CFP');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'YER', '[65020]', 1,				'Yemen Rial');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ZWD', '[90,36]', 1,				'Zimbabwe Dollar');
 

From ab37794f616a4f8df4a5a5ba5d6b308b55015b1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Aug 2017 19:34:26 +0200
Subject: [PATCH 6/9] Fix text

---
 htdocs/core/class/html.formmail.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f2e861ea932..4ec9c91aa80 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -473,7 +473,7 @@ class FormMail extends Form
         				$out.= ' &lt;'.$this->tomail.'&gt;';
         				if ($this->withtofree)
         				{
-        					$out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+        					$out.= '<br>'.$langs->trans("and").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
         				}
         			}
         			else
@@ -489,7 +489,7 @@ class FormMail extends Form
         			}
         			if (! empty($this->withto) && is_array($this->withto))
         			{
-        				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
+        				if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
         			    // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
         				$tmparray = $this->withto;
         				foreach($tmparray as $key => $val)
@@ -522,7 +522,7 @@ class FormMail extends Form
         			$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
         			if (! empty($this->withtocc) && is_array($this->withtocc))
         			{
-        				$out.= " ".$langs->trans("or")." ";
+        				$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
         				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
         				$tmparray = $this->withtocc;
         				foreach($tmparray as $key => $val)
@@ -551,7 +551,7 @@ class FormMail extends Form
         			$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
         			if (! empty($this->withtoccc) && is_array($this->withtoccc))
         			{
-        				$out.= " ".$langs->trans("or")." ";
+        				$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
         				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
         				$tmparray = $this->withtoccc;
         				foreach($tmparray as $key => $val)

From 326d3df63f2a0b9151c1b303f2807607a8acd3a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Aug 2017 13:23:15 +0200
Subject: [PATCH 7/9] FIX select of category FIX pb with extrafield list and
 key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
---
 htdocs/core/class/commonobject.class.php      | 12 +++++
 htdocs/core/class/extrafields.class.php       |  4 +-
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/lib/functions.lib.php             |  2 +-
 htdocs/install/mysql/migration/repair.sql     |  3 +-
 htdocs/langs/en_US/admin.lang                 | 10 ++---
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/societe/list.php                       | 45 +++++++++++--------
 8 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8f618e2fbf0..a79f01d6ed8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4297,6 +4297,12 @@ abstract class CommonObject
                				$this->array_options[$key] = null;
                			}
              			break;
+             		/*case 'select':	// Not required, we chosed value='0' for undefined values
+             			if ($value=='-1')
+             			{
+             				$this->array_options[$key] = null;
+             			}
+             			break;*/
             		case 'price':
             			$this->array_options[$key] = price2num($this->array_options[$key]);
             			break;
@@ -4430,6 +4436,12 @@ abstract class CommonObject
                         $this->array_options["options_".$key] = null;
                     }
                     break;
+             	/*case 'select':	// Not required, we chosed value='0' for undefined values
+             		if ($value=='-1')
+             		{
+             			$this->array_options[$key] = null;
+             		}
+             		break;*/
                 case 'price':
                     $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
                     break;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index e44fa8a5aec..a01f97431ef 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -882,10 +882,10 @@ class ExtraFields
 			$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
-			    if ($key == '') continue;
+				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
-				$out.= ($value==$key?' selected':'');
+				$out.= (((string) $value == (string) $key)?' selected':'');
 				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
 				$out.='>'.$val.'</option>';
 			}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9a93276f299..b7a2b46dfc0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5029,7 +5029,7 @@ class Form
      *	@param	string			$htmlname       Name of html select area. Must start with "multi" if this is a multiselect
      *	@param	array			$array          Array (key => value)
      *	@param	string|string[]	$id             Preselected key or preselected keys for multiselect
-     *	@param	int				$show_empty     0 no empty value allowed, 1 or string to add an empty value into list (value is '' or '&nbsp;' if 1), <0 to add an empty value with key that is this value.
+     *	@param	int|string		$show_empty     0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.
      *	@param	int				$key_in_label   1 to show key into label with format "[key] value"
      *	@param	int				$value_as_key   1 to use value as key
      *	@param  string			$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5bd060c878a..46796467ae6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6264,7 +6264,7 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 	            	$newres .= $db->escape($tmpcrit2);
 	            	$newres .= $tmpafter;
 	            	$newres .= "'";
-	            	if (empty($tmpcrit2))
+	            	if ($tmpcrit2 == '')
 	            	{
 	            	    $newres .= ' OR ' . $field . " IS NULL";
 	            	}
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index e275d982da4..cd55b7b38e2 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -152,7 +152,8 @@ delete from llx_categorie where fk_parent not in (select rowid from tmp_categori
 drop table tmp_categorie;
 -- Fix: delete orphelin category.
 delete from llx_categorie_product where fk_categorie not in (select rowid from llx_categorie where type = 0);
-delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type in (1, 2));
+delete from llx_categorie_fournisseur where fk_categorie not in (select rowid from llx_categorie where type = 1);
+delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type = 2);
 delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
 delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 18be4cbd7c7..2e3ccdd965e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -391,11 +391,11 @@ ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>   
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 68a8d30afbe..f6ccf9b218b 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -227,7 +227,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    if ($crit != '' && (! in_array($typ, array('select')) || $crit != '0'))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 45030b7f3cd..7669cbdca36 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -72,7 +72,8 @@ $search_idprof4=trim(GETPOST('search_idprof4'));
 $search_idprof5=trim(GETPOST('search_idprof5'));
 $search_idprof6=trim(GETPOST('search_idprof6'));
 $search_sale=trim(GETPOST("search_sale",'int'));
-$search_categ=trim(GETPOST("search_categ",'int'));
+$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
+$search_categ_sup=trim(GETPOST("search_categ_sup",'int'));
 $search_country=GETPOST("search_country",'intcomma');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_status=GETPOST("search_status",'int');
@@ -215,7 +216,8 @@ if (empty($reshook))
     {
         $search_nom='';
         $search_alias='';
-        $search_categ=0;
+        $search_categ_cus=0;
+        $search_categ_sup=0;
         $search_sale='';
     	$search_barcode="";
         $search_customer_code='';
@@ -383,7 +385,8 @@ $sql.= " state.code_departement as state_code, state.nom as state_name";
 // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
 if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
 // We'll need these fields in order to filter by categ
-if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_soc";
+if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -396,7 +399,8 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_".($type=='f'?"fournisseur":"societe")." as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (! empty($search_categ_sup)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 $sql.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -407,8 +411,10 @@ if ($socid)                $sql.= " AND s.rowid = ".$socid;
 if ($search_sale)          $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
 if ($search_sale)          $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_categ > 0)     $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2)   $sql.= " AND cs.fk_categorie IS NULL";
+if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_sup > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
+if ($search_categ_sup == -2)   $sql.= " AND cs.fk_categorie IS NULL";
 
 if ($search_all)           $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 if (strlen($search_cti))   $sql.= natural_search('s.phone', $search_cti);
@@ -449,8 +455,8 @@ foreach ($search_array_options as $key => $val)
     $tmpkey=preg_replace('/search_options_/','',$key);
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    if (in_array($typ, array('int','double','real'))) $mode=1;    // Search on a numeric
+    if ($crit != '' && (! in_array($typ, array('select')) || $crit != '0'))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -499,7 +505,8 @@ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&con
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($search_all != '') $param = "&sall=".urlencode($search_all);
 if ($sall != '') $param .= "&sall=".urlencode($sall);
-if ($search_categ > 0) $param.='&search_categ='.urlencode($search_categ);
+if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
+if ($search_categ_sup > 0) $param.='&search_categ_sup='.urlencode($search_categ_sup);
 if ($search_sale > 0)	$param.='&search_sale='.urlencode($search_sale);
 if ($search_nom != '') $param.= "&search_nom=".urlencode($search_nom);
 if ($search_alias != '') $param.= "&search_alias=".urlencode($search_alias);
@@ -584,28 +591,28 @@ if ($search_all)
 
 // Filter on categories
 $moreforfilter='';
-if ($type == 'c' || $type == 'p')
-{
+//if ($type == 'c' || $type == 'p')
+//{
 	if (! empty($conf->categorie->enabled))
 	{
 		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('Categories'). ': ';
-		$moreforfilter.=$formother->select_categories('customer',$search_categ,'search_categ',1);
+	 	$moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Customer").'): ';
+		$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
 	 	$moreforfilter.='</div>';
 	}
-}
-if ($type == 'f')
-{
+//}
+//if ($type == 'f')
+//{
     if (! empty($conf->categorie->enabled))
     {
         require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
         $moreforfilter.='<div class="divsearchfield">';
-        $moreforfilter.=$langs->trans('Categories'). ': ';
-        $moreforfilter.=$formother->select_categories('supplier',$search_categ,'search_categ',1);
+        $moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Supplier").'): ';
+        $moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
         $moreforfilter.='</div>';
     }
-}
+//}
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)

From 2416c387f5069174b4a984a193b15383ba89d2df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Aug 2017 13:35:52 +0200
Subject: [PATCH 8/9] Fix trad

---
 htdocs/societe/list.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7669cbdca36..12241415195 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -591,28 +591,28 @@ if ($search_all)
 
 // Filter on categories
 $moreforfilter='';
-//if ($type == 'c' || $type == 'p')
-//{
+if (empty($type) || $type == 'c' || $type == 'p')
+{
 	if (! empty($conf->categorie->enabled))
 	{
 		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Customer").'): ';
+	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
 		$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
 	 	$moreforfilter.='</div>';
 	}
-//}
-//if ($type == 'f')
-//{
+}
+if (empty($type) || $type == 'f')
+{
     if (! empty($conf->categorie->enabled))
     {
         require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
         $moreforfilter.='<div class="divsearchfield">';
-        $moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Supplier").'): ';
+        $moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
         $moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
         $moreforfilter.='</div>';
     }
-//}
+}
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)

From ef31c47c15f0de49bf2a0fa01117334e0987ac86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Aug 2017 14:22:45 +0200
Subject: [PATCH 9/9] Fix clear filter

---
 htdocs/contrat/services.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 51061b4b6ad..aaf0d0cd796 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -154,6 +154,7 @@ if (empty($reshook))
 
     if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
     {
+   		$search_product_category=0;
     	$search_name="";
     	$search_contract="";
     	$search_service="";
@@ -176,6 +177,8 @@ if (empty($reshook))
     	$filter_opcloture="";
     	$mode='';
     	$filter='';
+    	$toselect='';
+    	$search_array_options=array();
     }
 }