From d51c22a012fb4c55751c96b0247e6a1cab371ec5 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 21 Sep 2017 17:28:00 +0200
Subject: [PATCH 01/52] NEW : customizable meteo in value or percentage

---
 htdocs/admin/delais.php | 239 ++++++++++++++++++++++++++++++++--------
 1 file changed, 196 insertions(+), 43 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d3ef125f2a7..0b6690cd051 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -136,8 +136,18 @@ if ($action == 'update')
     		}
     	}
 	}
-
-    dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
+	
+	dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE",GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"),'chaine',0,'',$conf->entity);
+    
+	// For update value with percentage
+	$plus='';
+	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
+	// Update values
+	for($i=0;$i<4;$i++) {
+    	if(isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'),'chaine',0,'',$conf->entity);
+    }
+    
 }
 
 
@@ -196,13 +206,6 @@ if ($action == 'edit')
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">' .$form->selectyesno('MAIN_DISABLE_METEO',(empty($conf->global->MAIN_DISABLE_METEO)?0:1),1) . '</td></tr>';
 
 	print '</table>';
-
-	print '<br>';
-
-    print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
-    print '<br>';
-
-    print '</form>';
 }
 else
 {
@@ -244,17 +247,20 @@ else
 
 	print '</table>';
 
-	print '<br>';
-
-    // Boutons d'action
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
-
 }
 
-print '<br>';
+print '<br />';
 
+if($action == 'edit') {
+	
+	$str = $langs->trans('StdMod');
+	$str = $langs->trans('PercentageMod');
+	print '<a href="#" onclick="return false;" id="change_mode">'.$str.'</a>';
+	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+	
+	print '<br /><br />';
+
+}
 
 // Show logo for weather
 print $langs->trans("DescWeather").'<br>';
@@ -268,35 +274,182 @@ $level1=$offset+1*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level
 $level2=$offset+2*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
 $level3=$offset+3*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
 $text=''; $options='height="60px"';
-print '<table>';
-print '<tr>';
-print '<td>';
-print img_weather($text,'weather-clear.png',$options);
-print '</td><td>= '.$level0.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-few-clouds.png',$options);
-print '</td><td>&lt;= '.$level1.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-clouds.png',$options);
-print '</td><td>&lt;= '.$level2.'</td>';
-print '</tr>';
+	
 
-print '<tr><td>';
-print img_weather($text,'weather-many-clouds.png',$options);
-print '</td><td>&lt;= '.$level3.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td>';
-print img_weather($text,'weather-storm.png',$options);
-print '</td><td>&gt; '.$level3.'</td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-print '</tr>';
+if($action == 'edit') {
+	
+	
+	print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+	
+	print '<table>';
+	print '<tr>';
+	print '<td>';
+	print img_weather($text,'weather-clear.png',$options);
+	print '</td><td>= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td>';
+	print img_weather($text,'weather-few-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td>';
+	print img_weather($text,'weather-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+	print '</tr>';
+	
+	print '<tr><td>';
+	print img_weather($text,'weather-many-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	/*print '<td>';
+	 print img_weather($text,'weather-storm.png',$options);
+	 print '</td><td>&gt; '.$level3.'</td>';*/
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '</tr>';
+	
+	print '</table>';
+	
+	print '</div>';
+	print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+	
+	print '<table>';
+	print '<tr>';
+	print '<td>';
+	print img_weather($text,'weather-clear.png',$options);
+	print '</td><td>= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td>';
+	print img_weather($text,'weather-few-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td>';
+	print img_weather($text,'weather-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+	print '</tr>';
+	
+	print '<tr><td>';
+	print img_weather($text,'weather-many-clouds.png',$options);
+	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	/*print '<td>';
+	 print img_weather($text,'weather-storm.png',$options);
+	 print '</td><td>&gt; '.$level3.'</td>';*/
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+	print '</tr>';
+	
+	print '</table>';
+	
+	print '</div>';
+	
+} else {
+	
+	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+	
+		print '<table>';
+		print '<tr>';
+		print '<td>';
+		print img_weather($text,'weather-clear.png',$options);
+		print '</td><td>= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-few-clouds.png',$options);
+		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-clouds.png',$options);
+		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+		print '</tr>';
+		
+		print '<tr><td>';
+		print img_weather($text,'weather-many-clouds.png',$options);
+		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-storm.png',$options);
+		print '</td><td>&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '</tr>';
+		
+		print '</table>';
+		
+	} else {
+		
+		print '<table>';
+		print '<tr>';
+		print '<td>';
+		print img_weather($text,'weather-clear.png',$options);
+		print '</td><td>= '.$level0.'</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-few-clouds.png',$options);
+		print '</td><td>&lt;= '.$level1.'</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-clouds.png',$options);
+		print '</td><td>&lt;= '.$level2.'</td>';
+		print '</tr>';
+		
+		print '<tr><td>';
+		print img_weather($text,'weather-many-clouds.png',$options);
+		print '</td><td>&lt;= '.$level3.'</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td>';
+		print img_weather($text,'weather-storm.png',$options);
+		print '</td><td>&gt; '.$level3.'</td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
+		print '</tr>';
+		
+		print '</table>';
+		
+	}
+}
+print '</div>';
+	
+if($action == 'edit') {
+	
+	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<br></form>';
+	
+} else {
+	
+	// Boutons d'action
+	print '<br><div class="tabsAction">';
+	print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
+	
+}
 
-print '</table>';
+?>
 
+<script type="text/javascript">
+
+	$(document).ready(function() {
+
+		$("#change_mode").click(function() {
+			use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+			
+			if(use_percent.val() == 1) {
+				use_percent.val(0);
+				$("#standard").show();
+				$("#percentage").hide();
+			} else {
+				use_percent.val(1);
+				$("#standard").hide();
+				$("#percentage").show();
+			}
+		});
+
+	});
+
+</script>
+
+<?php
 
 llxFooter();
 $db->close();

From 6fa1929d5c66d39a00896ff75f8c2847bac64f20 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 25 Sep 2017 12:26:15 +0200
Subject: [PATCH 02/52] NEW : change description on click

---
 htdocs/admin/delais.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 0b6690cd051..2ac922a6a0a 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -251,20 +251,26 @@ else
 
 print '<br />';
 
+// Show logo for weather
+print $langs->trans("DescWeather").'<br>';
+
 if($action == 'edit') {
 	
-	$str = $langs->trans('StdMod');
-	$str = $langs->trans('PercentageMod');
-	print '<a href="#" onclick="return false;" id="change_mode">'.$str.'</a>';
+	$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoPercentageMod'));
+	$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoStdMod'));
+	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+	else $str_mode_enabled = $str_mode_percentage;
+	print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
 	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
 	
 	print '<br /><br />';
-
+	
+} else {
+	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+	else print $langs->trans('MeteoPercentageModEnabled');
+	print '<br /><br />';
 }
 
-// Show logo for weather
-print $langs->trans("DescWeather").'<br>';
-
 $offset=0;
 $cursor=10; // By default
 //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
@@ -432,16 +438,20 @@ if($action == 'edit') {
 	$(document).ready(function() {
 
 		$("#change_mode").click(function() {
-			use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
-			
+			var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+			var str_mode_std = "<?php print $str_mode_std; ?>";
+			var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+
 			if(use_percent.val() == 1) {
 				use_percent.val(0);
 				$("#standard").show();
 				$("#percentage").hide();
+				$(this).html(str_mode_std);
 			} else {
 				use_percent.val(1);
 				$("#standard").hide();
 				$("#percentage").show();
+				$(this).html(str_mode_percentage);
 			}
 		});
 

From 3db52aed78e02ab8d6fb841111ab9403faae5aa1 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 25 Sep 2017 17:13:50 +0200
Subject: [PATCH 03/52] NEW : calcul percentage ok

---
 htdocs/admin/delais.php |  61 ++++++++++-----------
 htdocs/index.php        | 114 ++++++++++++++++++++++++++++++++--------
 2 files changed, 122 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 2ac922a6a0a..0d9e80f5326 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -350,6 +350,36 @@ if($action == 'edit') {
 	
 	print '</div>';
 	
+	?>
+
+	<script type="text/javascript">
+	
+		$(document).ready(function() {
+	
+			$("#change_mode").click(function() {
+				var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+				var str_mode_std = "<?php print $str_mode_std; ?>";
+				var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+	
+				if(use_percent.val() == 1) {
+					use_percent.val(0);
+					$("#standard").show();
+					$("#percentage").hide();
+					$(this).html(str_mode_std);
+				} else {
+					use_percent.val(1);
+					$("#standard").hide();
+					$("#percentage").show();
+					$(this).html(str_mode_percentage);
+				}
+			});
+	
+		});
+	
+	</script>
+	
+	<?php
+	
 } else {
 	
 	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
@@ -416,6 +446,7 @@ if($action == 'edit') {
 		
 	}
 }
+
 print '</div>';
 	
 if($action == 'edit') {
@@ -431,35 +462,5 @@ if($action == 'edit') {
 	
 }
 
-?>
-
-<script type="text/javascript">
-
-	$(document).ready(function() {
-
-		$("#change_mode").click(function() {
-			var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
-			var str_mode_std = "<?php print $str_mode_std; ?>";
-			var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
-
-			if(use_percent.val() == 1) {
-				use_percent.val(0);
-				$("#standard").show();
-				$("#percentage").hide();
-				$(this).html(str_mode_std);
-			} else {
-				use_percent.val(1);
-				$("#standard").hide();
-				$("#percentage").show();
-				$(this).html(str_mode_percentage);
-			}
-		});
-
-	});
-
-</script>
-
-<?php
-
 llxFooter();
 $db->close();
diff --git a/htdocs/index.php b/htdocs/index.php
index 597d41423e5..c2b77d24222 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -384,7 +384,12 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $board=new Project($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['projects'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of tasks to do (late)
@@ -400,9 +405,17 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board=new Propal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
+    $wb_res = $board->load_board($user,"opened");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$nbtotal = (int)$board->nb['proposals'];
+    	$wb_res->nbtotal = $nbtotal;
+    }
+    $dashboardlines[] = $wb_res;
     // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+    $wb_res = $board->load_board($user,"signed");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of commercial proposals opened (expired)
@@ -410,9 +423,17 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 {
     include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
     $board=new SupplierProposal($db);
-    $dashboardlines[] = $board->load_board($user,"opened");
+    $wb_res = $board->load_board($user,"opened");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$nbtotal = (int)$board->nb['askprice'];
+    	$wb_res->nbtotal = $nbtotal;
+    }
+    $dashboardlines[] = $wb_res;
     // Number of commercial proposals CLOSED signed (billed)
-    $dashboardlines[] = $board->load_board($user,"signed");
+    $wb_res = $board->load_board($user,"signed");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of customer orders a deal
@@ -420,7 +441,12 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
     $board=new Commande($db);
-	$dashboardlines[] = $board->load_board($user);
+	$wb_res = $board->load_board($user);
+	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+		$board->load_state_board();
+		$wb_res->nbtotal = (int)$board->nb['orders'];
+	}
+	$dashboardlines[] = $wb_res;
 }
 
 // Number of suppliers orders a deal
@@ -428,7 +454,12 @@ if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->comma
 {
     include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
     $board=new CommandeFournisseur($db);
-	$dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['supplier_orders'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of services enabled (delayed)
@@ -436,16 +467,29 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
     $board=new Contrat($db);
-    $dashboardlines[] = $board->load_board($user,"inactives");
-	// Number of active services (expired)
-    $dashboardlines[] = $board->load_board($user,"expired");
+    $wb_res = $board->load_board($user,"inactives");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$nbtotal = (int)$board->nb['Contracts'];
+    	$wb_res->nbtotal = $nbtotal;
+    }
+    $dashboardlines[] = $wb_res;
+    // Number of active services (expired)
+    $wb_res = $board->load_board($user,"expired");
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
+    $dashboardlines[] = $wb_res;
 }
 // Number of invoices customers (has paid)
 if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
     $board=new Facture($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['invoices'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of supplier invoices (has paid)
@@ -453,7 +497,12 @@ if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fourniss
 {
     include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
     $board=new FactureFournisseur($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['supplier_invoices'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of transactions to conciliate
@@ -481,7 +530,12 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
 {
     include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
     $board=new Adherent($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['members'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of expense reports to approve
@@ -489,7 +543,12 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->appr
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user,'toapprove');
+    $wb_res = $board->load_board($user,'toapprove');
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['expensereports'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of expense reports to pay
@@ -497,11 +556,16 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_p
 {
     include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user,'topay');
+    $wb_res = $board->load_board($user,'topay');
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['expensereports'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Calculate total nb of late
-$totallate=0;
+$totallate=$totalglobal=0;
 $var=true;
 
 //Remove any invalid response
@@ -516,11 +580,13 @@ foreach($dashboardlines as $tmp)
 foreach($valid_dashboardlines as $board)
 {
     if ($board->nbtodolate > 0) {
+    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totalglobal += $board->nbtotal;
 	    $totallate += $board->nbtodolate;
     }
 }
-
-
+//var_dump($totallate, $totalglobal);
+if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallate / $totalglobal * 100;
+//var_dump($totallate);
 $boxwork='';
 $boxwork.='<div class="box">';
 $boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
@@ -686,15 +752,17 @@ $db->close();
 function showWeather($totallate,$text,$options)
 {
     global $conf;
-
+    
     $out='';
     $offset=0;
     $factor=10; // By default
 
-    $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
-    $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
-    $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
-    $level3=$offset+3*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
+    $used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
+    
+    $level0=$offset;           if (! empty($conf->global->{$used_conf.'0'})) $level0=$conf->global->{$used_conf.'0'};
+    $level1=$offset+1*$factor; if (! empty($conf->global->{$used_conf.'1'})) $level1=$conf->global->{$used_conf.'1'};
+    $level2=$offset+2*$factor; if (! empty($conf->global->{$used_conf.'2'})) $level2=$conf->global->{$used_conf.'2'};
+    $level3=$offset+3*$factor; if (! empty($conf->global->{$used_conf.'3'})) $level3=$conf->global->{$used_conf.'3'};
 
     if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
     if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);

From 3cec3085862e911bfd7dbb824d3998cbfe4a4a3b Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 25 Sep 2017 17:19:56 +0200
Subject: [PATCH 04/52] NEW : langs

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1e855abc41a..a7a0c6f645f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1089,6 +1089,11 @@ ShowProfIdInAddress=Show professionnal id with addresses on documents
 ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 TranslationUncomplete=Partial translation
 MAIN_DISABLE_METEO=Disable meteo view
+MeteoStdMod=Standard mode
+MeteoStdModEnabled=Standard mode enabled
+MeteoPercentageMod=Percentage mode
+MeteoPercentageModEnabled=Percentage mode enabled
+MeteoUseMod=Click to use %s
 TestLoginToAPI=Test login to API
 ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. 
 ExternalAccess=External access

From 7f938bc517f1ae1e3766f5c68e6519ce6c71fd6d Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 26 Sep 2017 12:32:58 +0200
Subject: [PATCH 05/52] NEW : unexistant function load_state_board() on several
 objects

---
 htdocs/comm/action/class/actioncomm.class.php | 132 +++++++++-----
 htdocs/compta/bank/class/account.class.php    | 128 ++++++++-----
 .../cheque/class/remisecheque.class.php       |  65 +++++--
 htdocs/index.php                              |  29 ++-
 htdocs/projet/class/task.class.php            | 171 +++++++++++-------
 5 files changed, 356 insertions(+), 169 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index ec1c84dd652..ff5b2aca769 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -907,7 +907,7 @@ class ActionComm extends CommonObject
             return $db->lasterror();
         }
     }
-
+    
     /**
      * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -916,50 +916,92 @@ class ActionComm extends CommonObject
      */
     function load_board($user)
     {
-        global $conf, $langs;
-
-        $sql = "SELECT a.id, a.datep as dp";
-        $sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
-        $sql.= ")";
-        if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-        $sql.= " WHERE a.percent >= 0 AND a.percent < 100";
-        $sql.= " AND a.entity IN (".getEntity('agenda').")";
-        if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-        if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
-        if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $agenda_static = new ActionComm($this->db);
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $conf->agenda->warning_delay/60/60/24;
-	        $response->label = $langs->trans("ActionsToDo");
-	        $response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
-	        if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
-	        $response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
-
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
-            {
-	            $response->nbtodo++;
-
-                $agenda_static->datep = $this->db->jdate($obj->dp);
-
-                if ($agenda_static->hasDelay()) {
-	                $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
+    	global $conf, $langs;
+    	
+    	$sql = "SELECT a.id, a.datep as dp";
+    	$sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
+    	$sql.= ")";
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+    	$sql.= " WHERE a.percent >= 0 AND a.percent < 100";
+    	$sql.= " AND a.entity IN (".getEntity('agenda').")";
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+    	if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
+    	if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+    	
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		$agenda_static = new ActionComm($this->db);
+    		
+    		$response = new WorkboardResponse();
+    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
+    		$response->label = $langs->trans("ActionsToDo");
+    		$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
+    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
+    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
+    		
+    		// This assignment in condition is not a bug. It allows walking the results.
+    		while ($obj=$this->db->fetch_object($resql))
+    		{
+    			$response->nbtodo++;
+    			
+    			$agenda_static->datep = $this->db->jdate($obj->dp);
+    			
+    			if ($agenda_static->hasDelay()) {
+    				$response->nbtodolate++;
+    			}
+    		}
+    		
+    		return $response;
+    	}
+    	else
+    	{
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
+    }
+    
+    /**
+     *      Charge indicateurs this->nb de tableau de bord
+     *
+     *      @return     int         <0 if ko, >0 if ok
+     */
+    function load_state_board()
+    {
+    	global $user;
+    	
+    	$this->nb=array();
+    	
+    	$sql = "SELECT count(a.id) as nb";
+    	$sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
+    	$sql.= ")";
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+    	$sql.= " WHERE a.entity IN (".getEntity('agenda').")";
+    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+    	if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
+    	if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+    	
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		$agenda_static = new ActionComm($this->db);
+    		
+    		while ($obj=$this->db->fetch_object($resql))
+    		{
+    			$this->nb["actionscomm"]=$obj->nb;
+    		}
+    		
+    		$this->db->free($resql);
+    		return 1;
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
     }
 
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index cb59862e005..4de089f767b 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1151,7 +1151,7 @@ class Account extends CommonObject
             return $solde;
         }
     }
-
+    
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -1161,50 +1161,88 @@ class Account extends CommonObject
      */
     function load_board(User $user, $filteraccountid = 0)
     {
-        global $conf, $langs;
-
-        if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
-
-        $sql = "SELECT b.rowid, b.datev as datefin";
-        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
-        $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
-        $sql.= " WHERE b.rappro=0";
-        $sql.= " AND b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
-        $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
-        $sql.= " AND clos = 0";
-        if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-	        $langs->load("banks");
-	        $now=dol_now();
-
-            require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
-	        $response->label=$langs->trans("TransactionsToConciliate");
-	        $response->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
-	        $response->img=img_object('',"payment");
-
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-                if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
-	                $response->nbtodolate++;
-                }
-            }
-
-            return $response;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
+    	global $conf, $langs;
+    	
+    	if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+    	
+    	$sql = "SELECT b.rowid, b.datev as datefin";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
+    	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+    	$sql.= " WHERE b.rappro=0";
+    	$sql.= " AND b.fk_account = ba.rowid";
+    	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+    	$sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
+    	$sql.= " AND clos = 0";
+    	if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+    	
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{
+    		$langs->load("banks");
+    		$now=dol_now();
+    		
+    		require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+    		
+    		$response = new WorkboardResponse();
+    		$response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
+    		$response->label=$langs->trans("TransactionsToConciliate");
+    		$response->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
+    		$response->img=img_object('',"payment");
+    		
+    		while ($obj=$this->db->fetch_object($resql))
+    		{
+    			$response->nbtodo++;
+    			if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
+    				$response->nbtodolate++;
+    			}
+    		}
+    		
+    		return $response;
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
+    }
+    
+    /**
+     *      Charge indicateurs this->nb de tableau de bord
+     *
+     *      @return     int         <0 if ko, >0 if ok
+     */
+    function load_state_board($filteraccountid = 0)
+    {
+    	global $user;
+    	
+    	if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+    	
+    	$sql = "SELECT count(b.rowid) as nb";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
+    	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+    	$sql.= " WHERE b.fk_account = ba.rowid";
+    	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+    	$sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
+    	$sql.= " AND clos = 0";
+    	if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+    	
+    	$resql=$this->db->query($sql);
+    	if ($resql)
+    	{    		
+    		while ($obj=$this->db->fetch_object($resql))
+    		{
+    			$this->nb["banklines"]=$obj->nb;
+    		}
+    		$this->db->free($resql);
+    		return 1;
+    	}
+    	else
+    	{
+    		dol_print_error($this->db);
+    		$this->error=$this->db->error();
+    		return -1;
+    	}
     }
 
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 808d2cbb00b..8f5f51f36e9 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -478,20 +478,20 @@ class RemiseCheque extends CommonObject
 			return "";
 		}
 	}
-
-
+	
+	
 	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param      User	$user       Objet user
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param      User	$user       Objet user
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
 	function load_board($user)
 	{
 		global $conf, $langs;
-
+		
 		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
-
+		
 		$sql = "SELECT b.rowid, b.datev as datefin";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -500,28 +500,28 @@ class RemiseCheque extends CommonObject
 		$sql.= " AND b.fk_type = 'CHQ'";
 		$sql.= " AND b.fk_bordereau = 0";
 		$sql.= " AND b.amount > 0";
-
+		
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			$langs->load("banks");
 			$now=dol_now();
-
+			
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
 			$response->label=$langs->trans("BankChecksToReceipt");
 			$response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank';
 			$response->img=img_object('',"payment");
-
+			
 			while ($obj=$this->db->fetch_object($resql))
 			{
 				$response->nbtodo++;
-
+				
 				if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->cheque->warning_delay)) {
 					$response->nbtodolate++;
 				}
 			}
-
+			
 			return $response;
 		}
 		else
@@ -531,6 +531,45 @@ class RemiseCheque extends CommonObject
 			return -1;
 		}
 	}
+	
+	
+	/**
+	 *      Charge indicateurs this->nb de tableau de bord
+	 *
+	 *      @return     int         <0 if ko, >0 if ok
+	 */
+	function load_state_board()
+	{
+		global $user;
+		
+		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+		
+		$sql = "SELECT count(b.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql.= " WHERE b.fk_account = ba.rowid";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
+		$sql.= " AND b.fk_type = 'CHQ'";
+		$sql.= " AND b.amount > 0";
+		
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["cheques"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 
 	/**
diff --git a/htdocs/index.php b/htdocs/index.php
index c2b77d24222..9298e9c411f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -375,8 +375,12 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
     $board=new ActionComm($db);
-
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['actionscomm'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of project opened
@@ -397,7 +401,12 @@ if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
     $board=new Task($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['tasks'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of commercial proposals opened (expired)
@@ -513,7 +522,12 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
     $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
     if ($nb > 0)
     {
-        $dashboardlines[] = $board->load_board($user);
+    	$wb_res = $board->load_board($user);
+    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    		$board->load_state_board();
+    		$wb_res->nbtotal = (int)$board->nb['banklines'];
+    	}
+    	$dashboardlines[] = $wb_res;
     }
 }
 
@@ -522,7 +536,12 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
     $board=new RemiseCheque($db);
-    $dashboardlines[] = $board->load_board($user);
+    $wb_res = $board->load_board($user);
+    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+    	$board->load_state_board();
+    	$wb_res->nbtotal = (int)$board->nb['cheques'];
+    }
+    $dashboardlines[] = $wb_res;
 }
 
 // Number of foundation members
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 10a78e017c8..32ae678b016 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1693,8 +1693,8 @@ class Task extends CommonObject
 
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
-
-
+	
+	
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1703,65 +1703,114 @@ class Task extends CommonObject
 	 */
 	function load_board($user)
 	{
-	    global $conf, $langs;
-
-	    $mine=0; $socid=$user->societe_id;
-
-	    $projectstatic = new Project($this->db);
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
-
-	    // List of tasks (does not care about permissions. Filtering will be done later)
-	    $sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
-	    $sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
-	    $sql.= " t.dateo as date_start, t.datee as datee";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-        $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
-        $sql.= " AND p.fk_statut = 1";
-        $sql.= " AND t.fk_projet = p.rowid";
-        $sql.= " AND t.progress < 100";         // tasks to do
-        if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
-        // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-        //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-        //print $sql;
-	    $resql=$this->db->query($sql);
-	    if ($resql)
-	    {
-	        $task_static = new Task($this->db);
-
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
-	        $response->label = $langs->trans("OpenedTasks");
-	        if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
-	        else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
-	        $response->img = img_object('',"task");
-
-	        // This assignment in condition is not a bug. It allows walking the results.
-	        while ($obj=$this->db->fetch_object($resql))
-	        {
-	            $response->nbtodo++;
-
-	            $task_static->projectstatus = $obj->projectstatus;
-	            $task_static->progress = $obj->progress;
-	            $task_static->fk_statut = $obj->status;
-	            $task_static->date_end = $this->db->jdate($obj->datee);
-
-	            if ($task_static->hasDelay()) {
-	                $response->nbtodolate++;
-	            }
-	        }
-
-	        return $response;
-	    }
-	    else
-	    {
-	        $this->error=$this->db->error();
-	        return -1;
-	    }
+		global $conf, $langs;
+		
+		$mine=0; $socid=$user->societe_id;
+		
+		$projectstatic = new Project($this->db);
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
+		
+		// List of tasks (does not care about permissions. Filtering will be done later)
+		$sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
+		$sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
+		$sql.= " t.dateo as date_start, t.datee as datee";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
+		$sql.= " AND p.fk_statut = 1";
+		$sql.= " AND t.fk_projet = p.rowid";
+		$sql.= " AND t.progress < 100";         // tasks to do
+		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		//print $sql;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$task_static = new Task($this->db);
+			
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
+			$response->label = $langs->trans("OpenedTasks");
+			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
+			else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
+			$response->img = img_object('',"task");
+			
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+				
+				$task_static->projectstatus = $obj->projectstatus;
+				$task_static->progress = $obj->progress;
+				$task_static->fk_statut = $obj->status;
+				$task_static->date_end = $this->db->jdate($obj->datee);
+				
+				if ($task_static->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
+			
+			return $response;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+	
+	
+	/**
+	 *      Charge indicateurs this->nb de tableau de bord
+	 *
+	 *      @return     int         <0 if ko, >0 if ok
+	 */
+	function load_state_board()
+	{
+		global $user;
+		
+		$mine=0; $socid=$user->societe_id;
+		
+		$projectstatic = new Project($this->db);
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
+		
+		// List of tasks (does not care about permissions. Filtering will be done later)
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
+		$sql.= " AND t.fk_projet = p.rowid";         // tasks to do
+		if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+		
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["tasks"]=$obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
 	}
 
 	/**

From 8de9c5cd36d454eeb71e1fda311e010b9c8d5b03 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 26 Sep 2017 14:18:26 +0200
Subject: [PATCH 06/52] FIX : forgotten php doc on function parameter

---
 htdocs/compta/bank/class/account.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4de089f767b..2eedf341178 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1209,7 +1209,7 @@ class Account extends CommonObject
     
     /**
      *      Charge indicateurs this->nb de tableau de bord
-     *
+     *		@param 		int			id of bank acount for filter
      *      @return     int         <0 if ko, >0 if ok
      */
     function load_state_board($filteraccountid = 0)

From d270a8e0093aeae5b57613b58445fc1c4ebb077c Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 26 Sep 2017 16:09:40 +0200
Subject: [PATCH 07/52] FIX : same than precedent commit

---
 htdocs/compta/bank/class/account.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2eedf341178..53e84b036d4 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1209,7 +1209,7 @@ class Account extends CommonObject
     
     /**
      *      Charge indicateurs this->nb de tableau de bord
-     *		@param 		int			id of bank acount for filter
+     *		@param		int			$filteraccountid	To get info for a particular account id
      *      @return     int         <0 if ko, >0 if ok
      */
     function load_state_board($filteraccountid = 0)

From 3849da4fe421fa97974116264eeb2f64d56beab2 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Wed, 27 Sep 2017 09:09:38 +0200
Subject: [PATCH 08/52] Line missing (error 500)

Create an instance of ProductFournisseur.
---
 htdocs/fourn/commande/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a7568f446ca..0e23b62fbb0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -561,6 +561,7 @@ if (empty($reshook))
 	        	if (!$res) dol_print_error($db);
 		}
 		
+		$productsupplier = new ProductFournisseur($db);
 		if ($productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
 		{
 			setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');

From 1694737e0bc37d676da556d5ea848a7ca7a1a370 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 27 Sep 2017 10:09:21 +0200
Subject: [PATCH 09/52] NEW : new param on load_board() function in ActionComm
 class to avoid duplicate code

---
 htdocs/comm/action/class/actioncomm.class.php | 87 ++++++-------------
 htdocs/index.php                              |  2 +-
 2 files changed, 27 insertions(+), 62 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index ff5b2aca769..12c11f863f1 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -911,19 +911,25 @@ class ActionComm extends CommonObject
     /**
      * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
-     * @param	User	$user   Objet user
+     * @param	User	$user   			Objet user
+     * @param	int		$load_state_board	Charge indicateurs this->nb de tableau de bord
      * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
      */
-    function load_board($user)
+    function load_board($user, $load_state_board=0)
     {
     	global $conf, $langs;
     	
-    	$sql = "SELECT a.id, a.datep as dp";
+    	if(empty($load_state_board)) $sql = "SELECT a.id, a.datep as dp";
+    	else {
+    		$this->nb=array();
+    		$sql = "SELECT count(a.id) as nb";
+    	}
     	$sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
     	$sql.= ")";
     	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-    	$sql.= " WHERE a.percent >= 0 AND a.percent < 100";
+    	$sql.= " WHERE 1";
+    	if(empty($load_state_board)) $sql.= " AND a.percent >= 0 AND a.percent < 100";
     	$sql.= " AND a.entity IN (".getEntity('agenda').")";
     	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
     	if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
@@ -932,69 +938,28 @@ class ActionComm extends CommonObject
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
-    		$agenda_static = new ActionComm($this->db);
-    		
-    		$response = new WorkboardResponse();
-    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
-    		$response->label = $langs->trans("ActionsToDo");
-    		$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
-    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
-    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
-    		
+    		if(empty($load_state_board)) {
+	    		$agenda_static = new ActionComm($this->db);
+	    		$response = new WorkboardResponse();
+	    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
+	    		$response->label = $langs->trans("ActionsToDo");
+	    		$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
+	    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
+	    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
+    		}
     		// This assignment in condition is not a bug. It allows walking the results.
     		while ($obj=$this->db->fetch_object($resql))
     		{
-    			$response->nbtodo++;
-    			
-    			$agenda_static->datep = $this->db->jdate($obj->dp);
-    			
-    			if ($agenda_static->hasDelay()) {
-    				$response->nbtodolate++;
-    			}
-    		}
-    		
-    		return $response;
-    	}
-    	else
-    	{
-    		$this->error=$this->db->error();
-    		return -1;
-    	}
-    }
-    
-    /**
-     *      Charge indicateurs this->nb de tableau de bord
-     *
-     *      @return     int         <0 if ko, >0 if ok
-     */
-    function load_state_board()
-    {
-    	global $user;
-    	
-    	$this->nb=array();
-    	
-    	$sql = "SELECT count(a.id) as nb";
-    	$sql.= " FROM (".MAIN_DB_PREFIX."actioncomm as a";
-    	$sql.= ")";
-    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-    	$sql.= " WHERE a.entity IN (".getEntity('agenda').")";
-    	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-    	if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
-    	if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
-    	
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
-    		$agenda_static = new ActionComm($this->db);
-    		
-    		while ($obj=$this->db->fetch_object($resql))
-    		{
-    			$this->nb["actionscomm"]=$obj->nb;
+    			if(empty($load_state_board)) {
+	    			$response->nbtodo++;
+	    			$agenda_static->datep = $this->db->jdate($obj->dp);
+	    			if ($agenda_static->hasDelay()) $response->nbtodolate++;
+    			} else $this->nb["actionscomm"]=$obj->nb;
     		}
     		
     		$this->db->free($resql);
-    		return 1;
+    		if(empty($load_state_board)) return $response;
+    		else return 1;
     	}
     	else
     	{
diff --git a/htdocs/index.php b/htdocs/index.php
index 9298e9c411f..1d5f9c5350b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -377,7 +377,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
     $board=new ActionComm($db);
     $wb_res = $board->load_board($user);
     if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
+    	$board->load_board($user, 1);
     	$wb_res->nbtotal = (int)$board->nb['actionscomm'];
     }
     $dashboardlines[] = $wb_res;

From 00862913d8213e401b47d6ed126d4c011e82acce Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Wed, 27 Sep 2017 11:12:38 +0200
Subject: [PATCH 10/52] Add the attribute accept to input tag

I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example.
see :
*https://www.w3.org/wiki/HTML/Elements/input/file
*https://www.w3schools.com/TagS/att_input_accept.asp

Hope every body needs it.
tks
---
 htdocs/core/class/html.formfile.class.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 9d01a3c70b2..73198771b93 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -57,21 +57,22 @@ class FormFile
     /**
      *  Show form to upload a new file
 	 *
-     *  @param  string	$url			Url
-     *  @param  string	$title			Title zone (Title or '' or 'none')
+     *  @param  string		$url			Url
+     *  @param  string		$title			Title zone (Title or '' or 'none')
      *  @param  int		$addcancel		1=Add 'Cancel' button
      *	@param	int		$sectionid		If upload must be done inside a particular ECM section
      * 	@param	int		$perm			Value of permission to allow upload
-     *  @param  int		$size           Length of input file area. Deprecated.
-     *  @param	Object	$object			Object to use (when attachment is done on an element)
-     *  @param	string	$options		Add an option column
-     *  @param	integer	$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
-     *  @param	string	$savingdocmask	Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
-     *  @param	integer	$linkfiles		1=Also add form to link files, 0=Do not show form to link files
-     *  @param	string	$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param  int		$size          		Length of input file area. Deprecated.
+     *  @param	Object		$object			Object to use (when attachment is done on an element)
+     *  @param	string		$options		Add an option column
+     *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). 2 should never be used.
+     *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
+     *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
+     *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
      * 	@return	int						<0 if KO, >0 if OK
      */
-    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile')
+    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='')
     {
         global $conf,$langs, $hookmanager;
         $hookmanager->initHooks(array('formfile'));
@@ -130,6 +131,7 @@ class FormFile
             $out .= '<input class="flat minwidth400" type="file"';
             $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= (!empty($accept)?' accept="'.$accept.'"':'accept=""');
             $out .= '>';
             $out .= ' ';
             $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';

From 154d5c876c08bc4b0cb33f13b809b7e33637927d Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Wed, 27 Sep 2017 12:24:19 +0200
Subject: [PATCH 11/52] NEW Get the list of payments terms

Adds the ability to get the list of payments terms using the REST API.
---
 htdocs/api/class/api_dictionary.class.php | 90 ++++++++++++++++++++---
 1 file changed, 79 insertions(+), 11 deletions(-)

diff --git a/htdocs/api/class/api_dictionary.class.php b/htdocs/api/class/api_dictionary.class.php
index 93f16d44377..e65bac7c670 100644
--- a/htdocs/api/class/api_dictionary.class.php
+++ b/htdocs/api/class/api_dictionary.class.php
@@ -1,5 +1,9 @@
 <?php
-/* Copyright (C) 2017	Neil Orley	<neil.orley@oeris.fr>
+/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
+ * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2017	Neil Orley	<neil.orley@oeris.fr>
+ *
  *
  * 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
@@ -21,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
 
 /**
- * API class for payment type (content of the paiement dictionary)
+ * API class for dictionaries
  *
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
@@ -47,13 +51,14 @@ class Dictionary extends DolibarrApi
      * @param int       $limit      Number of items per page
      * @param int       $page       Page number {@min 0}
      * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
      * 
-     * @url     GET payments
+     * @url     GET payment/types
      *
-     * @return List of payment types
-     *
-     * @throws RestException
+     * @return array [List of payment types]
+     *     
+     * @throws 400 RestException
+     * @throws 200 OK
      */
     function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
     {
@@ -62,14 +67,15 @@ class Dictionary extends DolibarrApi
         $sql = "SELECT id, code, type, libelle as label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
         $sql.= " WHERE t.active = ".$active;
+        
         // Add sql filters
         if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+	          $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -94,7 +100,7 @@ class Dictionary extends DolibarrApi
                 $list[] = $this->db->fetch_object($result);
             }
         } else {
-            throw new RestException(503, 'Error when retrieving list of payment types : '.$this->db->lasterror());
+            throw new RestException(400, $this->db->lasterror());
         }
 
         return $list;
@@ -447,6 +453,68 @@ class Dictionary extends DolibarrApi
         }
         
         return $list;
-    }       
+    } 
+    
+    /**
+     * Get the list of payments terms.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     * 
+     * @url     GET payment/terms
+     *
+     * @return array List of payment terms
+     *
+     * @throws 400 RestException
+     * @throws 200 OK
+     */
+    function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+        $sql.= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }          
 
 }

From b8afabfd0bacfb332a11bd6568be6d9e3737b811 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Wed, 27 Sep 2017 12:27:47 +0200
Subject: [PATCH 12/52] Change RestException return code 503 to 400 (Bad
 request) when the request is incorrect : SQL error or wrong sqlfilter Add
 comment to getPaymentTypes function Change the "API class for" description
 from "payment type" to "dictionaries" Change Copyright to add all previous
 devs

---
 htdocs/api/class/api_dictionary.class.php | 62 -----------------------
 1 file changed, 62 deletions(-)

diff --git a/htdocs/api/class/api_dictionary.class.php b/htdocs/api/class/api_dictionary.class.php
index e65bac7c670..ac15f3dec3f 100644
--- a/htdocs/api/class/api_dictionary.class.php
+++ b/htdocs/api/class/api_dictionary.class.php
@@ -455,66 +455,4 @@ class Dictionary extends DolibarrApi
         return $list;
     } 
     
-    /**
-     * Get the list of payments terms.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     * 
-     * @url     GET payment/terms
-     *
-     * @return array List of payment terms
-     *
-     * @throws 400 RestException
-     * @throws 200 OK
-     */
-    function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql.= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }          
-
 }

From 8c8868d76d5d6f841ce69d3e935f4067170a29f4 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Wed, 27 Sep 2017 12:32:18 +0200
Subject: [PATCH 13/52] Remove spaces

---
 htdocs/api/class/api_dictionary.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/api/class/api_dictionary.class.php b/htdocs/api/class/api_dictionary.class.php
index ac15f3dec3f..30e6138b1a2 100644
--- a/htdocs/api/class/api_dictionary.class.php
+++ b/htdocs/api/class/api_dictionary.class.php
@@ -67,7 +67,6 @@ class Dictionary extends DolibarrApi
         $sql = "SELECT id, code, type, libelle as label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
         $sql.= " WHERE t.active = ".$active;
-        
         // Add sql filters
         if ($sqlfilters)
         {
@@ -454,5 +453,4 @@ class Dictionary extends DolibarrApi
         
         return $list;
     } 
-    
 }

From bb4b2c5d881625938e68f200777c59afc75655da Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Wed, 27 Sep 2017 12:34:41 +0200
Subject: [PATCH 14/52] NEW Get the list of payments terms

Adds the ability to get the list of payments terms using the REST API.
---
 htdocs/api/class/api_dictionary.class.php | 63 +++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/htdocs/api/class/api_dictionary.class.php b/htdocs/api/class/api_dictionary.class.php
index 30e6138b1a2..b0d5bb00b0a 100644
--- a/htdocs/api/class/api_dictionary.class.php
+++ b/htdocs/api/class/api_dictionary.class.php
@@ -453,4 +453,67 @@ class Dictionary extends DolibarrApi
         
         return $list;
     } 
+
+    /**
+     * Get the list of payments terms.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+     *
+     * @url     GET payment/terms
+     *
+     * @return array List of payment terms
+     *
+     * @throws 400 RestException
+     * @throws 200 OK
+     */
+    function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+        $sql.= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }
+
 }

From 4084da28d19e0134089cd21e5106f7e6382987ef Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 27 Sep 2017 15:21:36 +0200
Subject: [PATCH 15/52] FIX : revert wrong code

---
 htdocs/index.php | 205 ++++++++++++++---------------------------------
 1 file changed, 61 insertions(+), 144 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 1d5f9c5350b..f8e90919c6a 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -373,218 +373,135 @@ require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 // Number of actions to do (late)
 if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
-    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-    $board=new ActionComm($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_board($user, 1);
-    	$wb_res->nbtotal = (int)$board->nb['actionscomm'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	$board=new ActionComm($db);
+	
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of project opened
 if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    $board=new Project($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['projects'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	$board=new Project($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
 if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-    $board=new Task($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['tasks'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+	$board=new Task($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
 if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-    $board=new Propal($db);
-    $wb_res = $board->load_board($user,"opened");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$nbtotal = (int)$board->nb['proposals'];
-    	$wb_res->nbtotal = $nbtotal;
-    }
-    $dashboardlines[] = $wb_res;
-    // Number of commercial proposals CLOSED signed (billed)
-    $wb_res = $board->load_board($user,"signed");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+	$board=new Propal($db);
+	$dashboardlines[] = $board->load_board($user,"opened");
+	// Number of commercial proposals CLOSED signed (billed)
+	$dashboardlines[] = $board->load_board($user,"signed");
 }
 
 // Number of commercial proposals opened (expired)
 if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $board=new SupplierProposal($db);
-    $wb_res = $board->load_board($user,"opened");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$nbtotal = (int)$board->nb['askprice'];
-    	$wb_res->nbtotal = $nbtotal;
-    }
-    $dashboardlines[] = $wb_res;
-    // Number of commercial proposals CLOSED signed (billed)
-    $wb_res = $board->load_board($user,"signed");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+	$board=new SupplierProposal($db);
+	$dashboardlines[] = $board->load_board($user,"opened");
+	// Number of commercial proposals CLOSED signed (billed)
+	$dashboardlines[] = $board->load_board($user,"signed");
 }
 
 // Number of customer orders a deal
 if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-    $board=new Commande($db);
-	$wb_res = $board->load_board($user);
-	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-		$board->load_state_board();
-		$wb_res->nbtotal = (int)$board->nb['orders'];
-	}
-	$dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+	$board=new Commande($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
 if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-    $board=new CommandeFournisseur($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['supplier_orders'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	$board=new CommandeFournisseur($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-    $board=new Contrat($db);
-    $wb_res = $board->load_board($user,"inactives");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$nbtotal = (int)$board->nb['Contracts'];
-    	$wb_res->nbtotal = $nbtotal;
-    }
-    $dashboardlines[] = $wb_res;
-    // Number of active services (expired)
-    $wb_res = $board->load_board($user,"expired");
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $wb_res->nbtotal = $nbtotal;
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+	$board=new Contrat($db);
+	$dashboardlines[] = $board->load_board($user,"inactives");
+	// Number of active services (expired)
+	$dashboardlines[] = $board->load_board($user,"expired");
 }
 // Number of invoices customers (has paid)
 if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-    $board=new Facture($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['invoices'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$board=new Facture($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
 if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fournisseur->facture->lire))
 {
-    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-    $board=new FactureFournisseur($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['supplier_invoices'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+	$board=new FactureFournisseur($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
 if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id)
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-    $board=new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
-    if ($nb > 0)
-    {
-    	$wb_res = $board->load_board($user);
-    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    		$board->load_state_board();
-    		$wb_res->nbtotal = (int)$board->nb['banklines'];
-    	}
-    	$dashboardlines[] = $wb_res;
-    }
+	include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	$board=new Account($db);
+	$nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+	if ($nb > 0)
+	{
+		$dashboardlines[] = $board->load_board($user);
+	}
 }
 
 // Number of cheque to send
 if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT))
 {
-    include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-    $board=new RemiseCheque($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['cheques'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+	$board=new RemiseCheque($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
 if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $user->societe_id)
 {
-    include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-    $board=new Adherent($db);
-    $wb_res = $board->load_board($user);
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['members'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	$board=new Adherent($db);
+	$dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->approve)
 {
-    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
-    $wb_res = $board->load_board($user,'toapprove');
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['expensereports'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$board=new ExpenseReport($db);
+	$dashboardlines[] = $board->load_board($user,'toapprove');
 }
 
 // Number of expense reports to pay
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid)
 {
-    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $board=new ExpenseReport($db);
-    $wb_res = $board->load_board($user,'topay');
-    if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-    	$board->load_state_board();
-    	$wb_res->nbtotal = (int)$board->nb['expensereports'];
-    }
-    $dashboardlines[] = $wb_res;
+	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$board=new ExpenseReport($db);
+	$dashboardlines[] = $board->load_board($user,'topay');
 }
 
 // Calculate total nb of late
-$totallate=$totalglobal=0;
+$totallate=$totaltodo=0;
 $var=true;
 
 //Remove any invalid response
@@ -599,12 +516,12 @@ foreach($dashboardlines as $tmp)
 foreach($valid_dashboardlines as $board)
 {
     if ($board->nbtodolate > 0) {
-    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totalglobal += $board->nbtotal;
+    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totaltodo += $board->nbtodo;
 	    $totallate += $board->nbtodolate;
     }
 }
-//var_dump($totallate, $totalglobal);
-if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallate / $totalglobal * 100;
+//var_dump($totallate, $totaltodo);
+if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = round($totallate / $totaltodo * 100, 2);
 //var_dump($totallate);
 $boxwork='';
 $boxwork.='<div class="box">';
@@ -618,7 +535,7 @@ if ($showweather)
     $boxwork.='<tr class="nohover">';
     $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
     $text='';
-    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
+    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
     $text.='. '.$langs->trans("LateDesc");
     //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
     $options='height="64px"';

From f1f4a2fb445ea01be6adf5828c3a25f36411283d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 17:40:14 +0200
Subject: [PATCH 16/52] Add email template to send SEPA mandate

---
 htdocs/core/lib/functions.lib.php                   | 7 ++++++-
 htdocs/install/mysql/data/llx_c_email_templates.sql | 4 +++-
 htdocs/langs/en_US/banks.lang                       | 4 +++-
 htdocs/langs/en_US/main.lang                        | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ba8e9f4d085..a826b16d266 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5234,7 +5234,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
             '__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
             '__MYCOMPANY_CAPITAL__' => $mysoc->capital,
-            '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
+            '__MYCOMPANY_FULLADDRESS__' => $mysoc->getFullAddress(1),
+            '__MYCOMPANY_ADDRESS__' => $mysoc->address,
+        	'__MYCOMPANY_ZIP__'     => $mysoc->zip,
+            '__MYCOMPANY_TOWN__'    => $mysoc->town,
+            '__MYCOMPANY_COUNTRY__'    => $mysoc->country,
+        	'__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
         ));
     }
     if (($onlykey || is_object($object)) && (empty($exclude) || ! in_array('object', $exclude)))
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index b3bb3292ba6..240be5fcbe6 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -20,4 +20,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(ThisIsContentOfYourCard)__<br />\n__(ID)__ : __ID__<br />\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br />\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__<br><br>__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
+
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'thirdparty',null,0,null,null,'(YourSEPAMandate)',1,1,'__(YourSEPAMandate)__','__(Hello)__<br><br>__(PleaseFindYourSEPAMandate)__<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__',null);
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index caed4498f3b..3ca1ac9ce5c 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -157,4 +157,6 @@ NewVariousPayment=New miscellaneous payments
 VariousPayment=Miscellaneous payments
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
\ No newline at end of file
+AddVariousPayment=Add miscellaneous payments
+YourSEPAMandate=Your SEPA mandate
+PleaseFindYourSEPAMandate=This is your SEPA mandate. Thanks to return it signed (scan of the signed document) or sent by mail to 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 93616b6151c..ba6b43fb9fc 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -814,6 +814,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Hello=Hello
+Goodbye=Goodbye
+Sincerely=Sincerely
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From 8242469e40af90d2c873d4acc91665bb94621ffd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 18:16:28 +0200
Subject: [PATCH 17/52] FIX The unique index on email templates can work now.

---
 htdocs/admin/mails_templates.php                     |  6 +++---
 htdocs/core/lib/functions.lib.php                    | 12 +++++++++---
 htdocs/install/mysql/data/llx_c_email_templates.sql  |  5 +++--
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql       |  6 +++++-
 .../install/mysql/tables/llx_c_email_templates.sql   |  3 ++-
 htdocs/langs/en_US/banks.lang                        |  2 +-
 htdocs/langs/en_US/main.lang                         |  4 +---
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 2f440f9f873..755440a47fd 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -177,7 +177,7 @@ if ($conf->fournisseur->enabled)       $elementList['invoice_supplier_send']=$la
 if ($conf->societe->enabled)           $elementList['thirdparty']=$langs->trans('MailToThirdparty');
 if ($conf->adherent->enabled)          $elementList['member']=$langs->trans('MailToMember');
 if ($conf->contrat->enabled)           $elementList['contract']=$langs->trans('MailToSendContract');
-$elementList['all']=$langs->trans('VisibleEverywhere');
+$elementList['all'] =$langs->trans('VisibleEverywhere');
 $elementList['none']=$langs->trans('VisibleNowhere');
 
 
@@ -295,7 +295,7 @@ if (empty($reshook))
                 if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
                 if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
                 if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
-                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  												// For vat, we want/accept code = ''
+                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
                 else $sql.="'".$db->escape($_POST[$keycode])."'";
                 $i++;
             }
@@ -485,7 +485,7 @@ if (! $user->admin)
 }
 if (empty($conf->global->MAIN_MULTILANGS))
 {
-	$sql.= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL)";
+	$sql.= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL OR lang = '')";
 }
 if ($search_label) $sql.=natural_search('label', $search_label);
 if ($search_type_template != '' && $search_type_template != '-1') $sql.=natural_search('type_template', $search_type_template);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a826b16d266..c252df5070e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5234,7 +5234,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
             '__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
             '__MYCOMPANY_CAPITAL__' => $mysoc->capital,
-            '__MYCOMPANY_FULLADDRESS__' => $mysoc->getFullAddress(1),
+            '__MYCOMPANY_FULLADDRESS__' => $mysoc->getFullAddress(1, ', '),
             '__MYCOMPANY_ADDRESS__' => $mysoc->address,
         	'__MYCOMPANY_ZIP__'     => $mysoc->zip,
             '__MYCOMPANY_TOWN__'    => $mysoc->town,
@@ -5395,8 +5395,14 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__USER_FIRSTNAME__' => (string) $user->firstname,
             '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
             '__USER_SUPERVISOR_ID__' => (string) $user->fk_user,
-        	'__SIGNATURE__' => (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '')
-        ));
+        	'__USER_SIGNATURE__' => (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '')
+	        )
+        );
+        // For backward compatibility
+        if ($onlykey != 2)
+        {
+        	$substitutionarray['__SIGNATURE__'] = (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '');
+        }
     }
     if (! empty($conf->multicompany->enabled))
     {
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index 240be5fcbe6..bfa183781c7 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -20,6 +20,7 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__<br><br>__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines) VALUES (0,'adherent','member','',0,null,null,'(SendAnEMailToMember)',1,1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null);
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines) VALUES (0,'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null);
+
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'thirdparty',null,0,null,null,'(YourSEPAMandate)',1,1,'__(YourSEPAMandate)__','__(Hello)__<br><br>__(PleaseFindYourSEPAMandate)__<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__',null);
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 0d2a6a7baed..b2df01afe51 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -70,8 +70,12 @@ ALTER TABLE llx_contrat MODIFY COLUMN ref_ext varchar(50);
 
 
 UPDATE llx_c_email_templates SET position = 0 WHERE position IS NULL;
+UPDATE llx_c_email_templates SET lang = '' WHERE lang IS NULL;
 
-INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,active,topic,content,content_lines) VALUES (0,null,'member',null,0,null,null,'(SendAnEMailToMember)',1,1,'__(CardContent)__','__(ThisIsContentOfYourCard)__<br />\n__(ID)__ : __ID__<br />\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br />\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__',null);
+ALTER TABLE llx_c_email_templates ADD COLUMN enabled varchar(255) DEFAULT '1';
+
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines) VALUES (0,'adherent','member','',0,null,null,'(SendAnEMailToMember)',1,1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br />\n__(Lastname)__ : __MEMBER_LASTNAME__<br />\n__(Fullname)__ : __MEMBER_FULLNAME__<br />\n__(Company)__ : __MEMBER_COMPANY__<br />\n__(Address)__ : __MEMBER_ADDRESS__<br />\n__(Zip)__ : __MEMBER_ZIP__<br />\n__(Town)__ : __MEMBER_TOWN__<br />\n__(Country)__ : __MEMBER_COUNTRY__<br />\n__(Email)__ : __MEMBER_EMAIL__<br />\n__(Birthday)__ : __MEMBER_BIRTH__<br />\n__(Photo)__ : __MEMBER_PHOTO__<br />\n__(Login)__ : __MEMBER_LOGIN__<br />\n__(Password)__ : __MEMBER_PASSWORD__<br />\n__(Phone)__ : __MEMBER_PHONE__<br />\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br />\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null);
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines) VALUES (0,'banque','thirdparty','',0,null,null,'(YourSEPAMandate)',1,1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',null);
 
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1, 'VENTES',    'Income of products/services',               'Exemple: 7xxxxx', 0, 0, '',                '10', 1, 1);
 INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2, 'DEPENSES',  'Expenses of products/services',             'Exemple: 6xxxxx', 0, 0, '',                '20', 1, 1);
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 9d82d37768a..69cbc186ebd 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -23,13 +23,14 @@ create table llx_c_email_templates
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   module          varchar(32),                    -- Nom du module en rapport avec le modele
   type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
-  lang            varchar(6),
+  lang            varchar(6) DEFAULT '',		  -- We use a default to '' so the unique index that include this field will work
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id user owner if template is private, or null
   datec           datetime,
   tms             timestamp,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
+  enabled         varchar(255) DEFAULT '1',		  -- Condition to have this module visible
   active          tinyint DEFAULT 1  NOT NULL,
   topic			  text,                           -- Predefined topic
   content         text,                           -- Predefined text
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 3ca1ac9ce5c..d45c0c15c1c 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -159,4 +159,4 @@ VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 YourSEPAMandate=Your SEPA mandate
-PleaseFindYourSEPAMandate=This is your SEPA mandate. Thanks to return it signed (scan of the signed document) or sent by mail to 
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ba6b43fb9fc..a21b2a9d355 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -770,6 +770,7 @@ Genderwoman=Woman
 ViewList=List view
 Mandatory=Mandatory
 Hello=Hello
+GoodBye=GoodBye
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
@@ -814,9 +815,6 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
-Hello=Hello
-Goodbye=Goodbye
-Sincerely=Sincerely
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From 7a0b8c39643c37d9b3582192ef5a125d8b1f63d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 18:23:49 +0200
Subject: [PATCH 18/52] Translation

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a21b2a9d355..bfcbb5a2010 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -262,6 +262,7 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
 UserCreationShort=Creat. user

From fdc1aa2a03e26cb45da0b356297934c6a957b59e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 19:56:03 +0200
Subject: [PATCH 19/52] NEW Move contacts of a thirdparty on tab
 Contacts/Addresses

---
 htdocs/contact/card.php                   |   4 +-
 htdocs/core/class/html.formmail.class.php |   8 +-
 htdocs/core/lib/company.lib.php           |  13 +-
 htdocs/core/lib/order.lib.php             |  20 +-
 htdocs/core/tpl/card_presend.tpl.php      |  42 +++--
 htdocs/langs/en_US/other.lang             |   4 +-
 htdocs/societe/card.php                   | 176 ++++++++---------
 htdocs/societe/class/societe.class.php    |   5 +
 htdocs/societe/contact.php                | 218 ++++++++++++++++++++++
 9 files changed, 353 insertions(+), 137 deletions(-)
 create mode 100644 htdocs/societe/contact.php

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 2d6f728b502..43b9b7e4760 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -541,7 +541,7 @@ else
                 {
                     print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
                     print '<td colspan="3" class="maxwidthonsmartphone">';
-                    print $objsoc->getNomUrl(1);
+                    print $objsoc->getNomUrl(1, 'contact');
                     print '</td>';
                     print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
                     print '</td></tr>';
@@ -1063,7 +1063,7 @@ else
             $objsoc->fetch($object->socid);
             // Thirdparty
             $morehtmlref.=$langs->trans('ThirdParty') . ' : ';
-            if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1);
+            if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1, 'contact');
             else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
         }
         $morehtmlref.='</div>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e1df1156239..0621e1d21f4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -301,7 +301,7 @@ class FormMail extends Form
         		{
 	        		$model_id=$this->param["models_id"];
         		}
-	        	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
+        		$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, ($model_id ? $model_id : -1));		// we set -1 if model_id empty
 			}
         	//var_dump($this->param["models"]);
         	//var_dump($model_id);
@@ -914,7 +914,7 @@ class FormMail extends Form
 	 * 		@param	string		$type_template	Get message for type=$type_template, type='all' also included.
 	 *      @param	string		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
-	 *      @param	int			$id				Id template to find
+	 *      @param	int			$id				Id of template to find, or -1 for first found with position = 0, or 0 for all
 	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
 	 *      @return array						array('topic'=>,'content'=>,..)
 	 */
@@ -929,8 +929,10 @@ class FormMail extends Form
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
-		if (!empty($id)) $sql.= " AND rowid=".$id;
+		if ($id > 0)   $sql.= " AND rowid=".$id;
+		if ($id == -1) $sql.= " AND position=0";
 		$sql.= $db->order("position,lang,label","ASC");
+		if ($id == -1) $sql.= $db->plimit(1);
 		//print $sql;
 
 		$resql = $db->query($sql);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 159e7a6435a..54c5abfda93 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -48,6 +48,17 @@ function societe_prepare_head(Societe $object)
     $head[$h][2] = 'card';
     $h++;
 
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+	    //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+		$nbContact = 0;	// TODO
+	    $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
+	    $head[$h][1] = $langs->trans('ContactsAddresses');
+	    if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	    $head[$h][2] = 'contact';
+	    $h++;
+	}
+
     if ($object->client==1 || $object->client==2 || $object->client==3)
     {
         $head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
@@ -748,7 +759,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<input type="hidden" name="page" value="'.$page.'">';
 
 
-	print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<div class="div-table-responsive-nomin">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
     print "\n".'<table class="noborder" width="100%">'."\n";
 
     $param="socid=".$object->id;
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 89bbe24ea47..5d9f9280cc8 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -48,6 +48,16 @@ function commande_prepare_head(Commande $object)
 		$h++;
 	}
 
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		$head[$h][2] = 'contact';
+		$h++;
+	}
+
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
 	{
@@ -60,16 +70,6 @@ function commande_prepare_head(Commande $object)
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index e24fbb44f7a..aa9353201cf 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -34,16 +34,19 @@ if ($action == 'presend')
 
 	$object->fetch_projet();
 
-	$ref = dol_sanitizeFileName($object->ref);
-	include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-	//
-	if ($object->element == 'invoice_supplier')
+	if (! in_array($object->element, array('societe', 'user')))
 	{
-		$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
-	}
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		//
+		if ($object->element == 'invoice_supplier')
+		{
+			$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+		}
 
-	$file = $fileparams['fullname'];
+		$file = $fileparams['fullname'];
+	}
 
 	// Define output language
 	$outputlangs = $langs;
@@ -72,16 +75,19 @@ if ($action == 'presend')
 	}
 
 	// Build document if it not exists
-	if (! $file || ! is_readable($file)) {
-		if ($object->element != 'member')
-		{
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
+	if (! in_array($object->element, array('societe', 'user')))
+	{
+		if (! $file || ! is_readable($file)) {
+			if ($object->element != 'member')
+			{
+				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result <= 0) {
+					dol_print_error($db, $object->error, $object->errors);
+					exit();
+				}
+				$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+				$file = $fileparams['fullname'];
 			}
-			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
 		}
 	}
 
@@ -106,7 +112,7 @@ if ($action == 'presend')
 	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index f1cca6a1696..a78981f32a1 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -87,8 +87,8 @@ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentThirdparty=\n\n__SIGNATURE__
+PredefinedMailContentUser=\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 236faaaa232..89074892fa9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -59,7 +59,7 @@ $action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
 $cancel     = GETPOST('cancel','alpha');
 $backtopage = GETPOST('backtopage','alpha');
 $confirm	= GETPOST('confirm');
-$socid		= GETPOST('socid','int');
+$socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
 if (empty($socid) && $action == 'view') $action='create';
 
@@ -2372,69 +2372,68 @@ else
         /*
          *  Actions
          */
-        print '<div class="tabsAction">'."\n";
+        if ($action != 'presend')
+        {
+	        print '<div class="tabsAction">'."\n";
 
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-			$at_least_one_email_contact = false;
-			$TContact = $object->contact_array_objects();
-			foreach ($TContact as &$contact)
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if (empty($reshook))
 			{
-				if (!empty($contact->email))
+				$at_least_one_email_contact = false;
+				$TContact = $object->contact_array_objects();
+				foreach ($TContact as &$contact)
 				{
-					$at_least_one_email_contact = true;
-					break;
+					if (!empty($contact->email))
+					{
+						$at_least_one_email_contact = true;
+						break;
+					}
 				}
+
+		        if (! empty($object->email) || $at_least_one_email_contact)
+		        {
+		        	$langs->load("mails");
+		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+		        }
+		        else
+				{
+		        	$langs->load("mails");
+		       		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+		        }
+
+		        if ($user->rights->societe->creer)
+		        {
+		            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		        }
+
+		        if ($user->rights->societe->supprimer)
+		        {
+		        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
+		        }
+
+		        if ($user->rights->societe->supprimer)
+		        {
+		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+		            {
+		                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+		            }
+		            else
+					{
+		                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+		            }
+		        }
 			}
 
-	        if (! empty($object->email) || $at_least_one_email_contact)
-	        {
-	        	$langs->load("mails");
-	        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendMail').'</a></div>';
-	        }
-	        else
-			{
-	        	$langs->load("mails");
-	       		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
-	        }
-
-	        if ($user->rights->societe->creer)
-	        {
-	            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-	        }
-
-	        if ($user->rights->societe->supprimer)
-	        {
-	        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
-	        }
-
-	        if ($user->rights->societe->supprimer)
-	        {
-	            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-	            {
-	                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-	            }
-	            else
-				{
-	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-	            }
-	        }
-		}
-
-        print '</div>'."\n";
+	        print '</div>'."\n";
+        }
 
         //Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
 			$action = 'presend';
 		}
-		if ($action == 'presend')
+		/*if ($action == 'presend')
 		{
-			/*
-			 * Affiche formulaire mail
-			*/
-
 			// By default if $action=='presend'
 			$titreform='SendMail';
 			$topicmail='';
@@ -2491,31 +2490,6 @@ else
 			$formmail->substit['__PERSONALIZED__']='';					// deprecated
 			$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_facture_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 du post
 			$formmail->param['action']=$action;
@@ -2533,14 +2507,15 @@ else
 			print $formmail->get_form();
 
 			dol_fiche_end();
-		}
-		else
+		}*/
+
+		if ($action != 'presend')
 		{
+			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
 	        {
-				print '<div class="fichecenter"><div class="fichehalfleft">';
-	            print '<a name="builddoc"></a>'; // ancre
+				print '<a name="builddoc"></a>'; // ancre
 
 	            /*
 	             * Documents generes
@@ -2553,35 +2528,34 @@ else
 	            $var=true;
 
 	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-
-				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-				print '</div></div></div>';
-
-	            print '<br>';
 	        }
 
-	        print '<div class="fichecenter"><br></div>';
-
 	        // Subsidiaries list
 	        if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
 	        {
-	           $result=show_subsidiaries($conf,$langs,$db,$object);
+	        	$result=show_subsidiaries($conf,$langs,$db,$object);
 	        }
 
-	        // Contacts list
-	        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	        {
-	            $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	        }
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	        // Addresses list
-	        if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
-	        {
-	        	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	        }
+			$MAX = 5;
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAX);		// Show all action for thirdparty
+
+			print '</div></div></div>';
 		}
+
+		// Presend form
+		$modelmail='thirdparty';
+		$defaulttopic='Information';
+		$diroutput = $conf->societe->dir_output;
+		$trackid = 'thi'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+
     }
 }
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 56ca7d3042b..1c8c515545a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1898,6 +1898,11 @@ class Societe extends CommonObject
             $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
         }
+        else if ($option == 'contact')
+        {
+        	$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+        	$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
+        }
 
         // By default
         if (empty($linkstart))
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
new file mode 100644
index 00000000000..f69eef22795
--- /dev/null
+++ b/htdocs/societe/contact.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2001-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Brian Fraval            <brian@fraval.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2008       Patrick Raguin          <patrick.raguin@auguria.net>
+ * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2013  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ *
+ * 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/societe/card.php
+ *  \ingroup    societe
+ *  \brief      Third party card page
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+$langs->load("companies");
+$langs->load("commercial");
+$langs->load("bills");
+$langs->load("banks");
+$langs->load("users");
+if (! empty($conf->categorie->enabled)) $langs->load("categories");
+if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
+if (! empty($conf->notification->enabled)) $langs->load("mails");
+
+$mesg=''; $error=0; $errors=array();
+
+$action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
+$cancel     = GETPOST('cancel','alpha');
+$backtopage = GETPOST('backtopage','alpha');
+$confirm	= GETPOST('confirm');
+$socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+if (empty($socid) && $action == 'view') $action='create';
+
+$object = new Societe($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('thirdpartycard','globalcard'));
+
+if ($action == 'view' && $object->fetch($socid)<=0)
+{
+	$langs->load("errors");
+	print($langs->trans('ErrorRecordNotFound'));
+	exit;
+}
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$object->getCanvas($socid);
+$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db, $action);
+    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+}
+
+// Security check
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
+
+
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    if ($cancel)
+    {
+        $action='';
+        if (! empty($backtopage))
+        {
+            header("Location: ".$backtopage);
+            exit;
+        }
+    }
+}
+
+
+/*
+ *  View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formadmin = new FormAdmin($db);
+$formcompany = new FormCompany($db);
+
+if ($socid > 0 && empty($object->id))
+{
+    $result=$object->fetch($socid);
+	if ($result <= 0) dol_print_error('',$object->error);
+}
+
+$title=$langs->trans("ThirdParty");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+    // -----------------------------------------
+    // When used with CANVAS
+    // -----------------------------------------
+   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
+    $objcanvas->display_canvas($action);							// Show template
+}
+else
+{
+
+        if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
+        //if ($res < 0) { dol_print_error($db); exit; }
+
+
+        $head = societe_prepare_head($object);
+
+        dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'company');
+
+        // Confirm delete third party
+        if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+        }
+
+	    if ($action == 'merge')
+	    {
+		    $formquestion = array(
+			    array(
+				    'name' => 'soc_origin',
+			    	'label' => $langs->trans('MergeOriginThirdparty'),
+				    'type' => 'other',
+				    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+			    )
+		    );
+
+		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 200);
+	    }
+
+	    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
+
+
+        print '<div style="clear:both"></div>';
+
+        dol_fiche_end();
+
+
+	if ($action != 'presend')
+	{
+		print '<div class="fichecenter">';
+
+		        // Contacts list
+        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+        {
+            $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+        }
+
+        // Addresses list
+        if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+        {
+        	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+        }
+
+
+		print '</div>';
+
+	}
+
+}
+
+
+// End of page
+llxFooter();
+$db->close();

From 6bdfa99fc2f2c0dbec14b06035bf4a8f32be741e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 20:07:01 +0200
Subject: [PATCH 20/52] FIX The backtopage

---
 htdocs/contact/card.php         |  9 +++++++++
 htdocs/core/lib/company.lib.php | 11 +++++++++++
 htdocs/ecm/docfile.php          |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 43b9b7e4760..ac3c52ae8f5 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -396,6 +396,15 @@ if (empty($reshook))
                 $action = 'edit';
             }
         }
+
+        if (! $error && empty($errors))
+        {
+       		if (! empty($backtopage))
+       		{
+       			header("Location: ".$backtopage);
+       			exit;
+       		}
+        }
     }
 }
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 54c5abfda93..f22da301ec4 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -52,6 +52,17 @@ function societe_prepare_head(Societe $object)
 	{
 	    //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$nbContact = 0;	// TODO
+
+		$sql = "SELECT COUNT(p.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
+		$sql .= " WHERE p.fk_soc = ".$object->id;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $nbContact = $obj->nb;
+		}
+
 	    $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
 	    $head[$h][1] = $langs->trans('ContactsAddresses');
 	    if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index a856ab22c36..f6719d08604 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -117,9 +117,9 @@ if (! ($result >= 0))
 if ($cancel)
 {
     $action ='';
-    if ($backtourl)
+    if ($backtopage)
     {
-        header("Location: ".$backtourl);
+        header("Location: ".$backtopage);
         exit;
     }
     else
@@ -387,7 +387,7 @@ if ($action != 'edit')
     {
         print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
 
-        //print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtourl='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
+        //print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtopage='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
     }
 /*
 	if ($user->rights->ecm->setup)

From e878f3cfd5ba574c56d8a93486347b7b3eaf894b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Sep 2017 20:15:56 +0200
Subject: [PATCH 21/52] No more need of contacts on each tab by default

---
 htdocs/core/class/conf.class.php |  5 ++---
 htdocs/societe/contact.php       | 38 +++++++-------------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index aa1651d6fc6..e0e032d7e25 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -259,9 +259,8 @@ class Conf
 		// Load translation object with current language
 		if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT="en_US";
 
-        // By default, we repeat info on all tabs
-		if (! isset($this->global->MAIN_REPEATCONTACTONEACHTAB)) $this->global->MAIN_REPEATCONTACTONEACHTAB=1;
-		if (! isset($this->global->MAIN_REPEATADDRESSONEACHTAB)) $this->global->MAIN_REPEATADDRESSONEACHTAB=1;
+		//if (! isset($this->global->MAIN_REPEATCONTACTONEACHTAB)) $this->global->MAIN_REPEATCONTACTONEACHTAB=1;
+		//if (! isset($this->global->MAIN_REPEATADDRESSONEACHTAB)) $this->global->MAIN_REPEATADDRESSONEACHTAB=1;
 
 		$rootfordata = DOL_DATA_ROOT;
 		$rootforuser = DOL_DATA_ROOT;
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index f69eef22795..56c729e76f4 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -151,43 +151,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 else
 {
 
-        if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
-        //if ($res < 0) { dol_print_error($db); exit; }
+    if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
+    //if ($res < 0) { dol_print_error($db); exit; }
 
 
-        $head = societe_prepare_head($object);
+    $head = societe_prepare_head($object);
 
-        dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'company');
+    dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'company');
 
-        // Confirm delete third party
-        if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
-        }
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	    if ($action == 'merge')
-	    {
-		    $formquestion = array(
-			    array(
-				    'name' => 'soc_origin',
-			    	'label' => $langs->trans('MergeOriginThirdparty'),
-				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
-			    )
-		    );
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 200);
-	    }
-
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
-
-
-        print '<div style="clear:both"></div>';
-
-        dol_fiche_end();
+    dol_fiche_end();
 
+	print '<br>';
 
 	if ($action != 'presend')
 	{

From 7374a2accd5155a960828e155b79424248d450eb Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Thu, 28 Sep 2017 12:14:49 +0200
Subject: [PATCH 22/52] NEW Download a document using the REST API

Adds the ability to download a document using the REST API
The document is sent in a base64 encoded format.
The API will return :

{
  "filename": "CO1709-0002.pdf",
  "content": "JVBERi0xLjMKJ...",
  "encoding": "MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)"
}
---
 htdocs/api/class/api_documents.class.php | 51 ++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index e26486981fa..4d0efb63d62 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -22,6 +22,7 @@ use Luracast\Restler\Format\UploadFormat;
 
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 /**
  * API class for receive files
@@ -54,13 +55,57 @@ class Documents extends DolibarrApi
      *
      * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
      * @param   string  $ref            Reference of object (This will define subdir automatically)
-     * @param   string  $subdir         Subdirectory (Only if ref not provided)
+     * @param   string  $subdir         NOT YET AVAILABLE : Subdirectory (Only if ref not provided)
      * @return  array                   List of documents
      *
-     * @throws RestException
+     * @throws 400
+     * @throws 401
+     * @throws 200 OK
      */
     public function index($module_part, $ref='', $subdir='') {
-        return array('note'=>'FeatureNotYetAvailable');
+	global $conf;
+
+	if (empty($module_part)) {
+            throw new RestException(400, 'bad value for parameter modulepart');
+	}
+        if (empty($ref) && empty($subdir)) {
+            throw new RestException(400, 'bad value for parameter ref or subdir');
+        }
+        if (empty($ref)) {
+            throw new RestException(404, 'FeatureNotYetAvailable');
+        }
+	if (!DolibarrApiAccess::$user->rights->ecm->read) {
+            throw new RestException(401);
+        }
+
+	$original_file = str_replace("../","/", $ref.'/'.$ref.'.pdf');
+	$refname=basename(dirname($original_file)."/");
+	$entity=$conf->entity;
+
+	$check_access = dol_check_secure_access_document($module_part,$original_file,$entity,DolibarrApiAccess::$user);
+	$accessallowed              = $check_access['accessallowed'];
+	$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+	$original_file              = $check_access['original_file'];
+
+	if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+	{
+	    throw new RestException(401);
+	}
+        if (!$accessallowed) {
+            throw new RestException(401);
+        }
+
+
+	$filename = basename($original_file);
+	$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+
+	if (! file_exists($original_file_osencoded))
+	{
+	    throw new RestException(404, 'File not found');
+	}
+
+	$file_content=file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
     }
     
     

From f007f9e7e5fd93ddf8493ca23305ec24d132868a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 13:26:44 +0200
Subject: [PATCH 23/52] NEW Add new property visible dy default on lists on
 extrafields

---
 htdocs/adherents/list.php                     |  2 +-
 htdocs/comm/propal/card.php                   |  8 +---
 htdocs/comm/propal/list.php                   |  2 +-
 htdocs/commande/list.php                      |  2 +-
 htdocs/compta/bank/bankentries.php            |  2 +-
 htdocs/compta/bank/index.php                  |  2 +-
 .../compta/facture/invoicetemplate_list.php   |  2 +-
 htdocs/compta/facture/list.php                |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/list.php                       |  2 +-
 htdocs/contrat/services.php                   |  2 +-
 htdocs/core/actions_extrafields.inc.php       |  5 ++-
 htdocs/core/class/extrafields.class.php       |  8 ++--
 htdocs/core/tpl/admin_extrafields_add.tpl.php | 13 +++---
 .../core/tpl/admin_extrafields_edit.tpl.php   | 13 +++---
 .../core/tpl/admin_extrafields_view.tpl.php   | 11 +++--
 htdocs/core/tpl/extrafields_add.tpl.php       | 40 +++++++++++++++++
 htdocs/core/tpl/extrafields_edit.tpl.php      | 40 +++++++++++++++++
 htdocs/expedition/list.php                    |  2 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/fichinter/list.php                     |  2 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/facture/list.php                 |  2 +-
 .../install/mysql/migration/6.0.0-7.0.0.sql   |  4 ++
 .../template/class/myobject.class.php         |  2 +-
 .../modulebuilder/template/myobject_card.php  | 43 ++++++++++++++-----
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  2 +-
 htdocs/societe/list.php                       |  2 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/user/index.php                         |  2 +-
 36 files changed, 170 insertions(+), 67 deletions(-)
 create mode 100644 htdocs/core/tpl/extrafields_add.tpl.php
 create mode 100644 htdocs/core/tpl/extrafields_edit.tpl.php

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 783934deb34..398d5b62adc 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -129,7 +129,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4fc1eebb66d..a7540c69840 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1530,13 +1530,7 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
 
 	// Lines from source
 	if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 41002eb9e71..0f2fd46c3f6 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -158,7 +158,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 927460c511a..fed61c1fc17 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -142,7 +142,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 8cb5b878dc0..a04d9cf0f2e 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -151,7 +151,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 4485680a4e9..31c777740ac 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -103,7 +103,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index e911f6eab74..f39fc7a3185 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -138,7 +138,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index d6ffc854844..be81fe48a0c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -174,7 +174,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ebf7bc611f9..05fcf3e0916 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -160,7 +160,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 2afee019bed..64f2b6b94f2 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -133,7 +133,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index ddb19e3e88c..945b5b8b983 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -134,7 +134,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 433288606ec..b6e70059da3 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -159,6 +159,7 @@ if ($action == 'add')
     					$params['options'][$key] = $value;
     				}
     			}
+
                 $result=$extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
                 	GETPOST('label', 'alpha'),
@@ -172,7 +173,7 @@ if ($action == 'add')
                 	$params,
                 	(GETPOST('alwayseditable', 'alpha')?1:0),
                 	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	(GETPOST('list', 'alpha')?1:0),
+                	GETPOST('list', 'alpha'),				// Same as visible -1=not visible by default in list, 1=visible, 0=not visible in list
 					(GETPOST('ishidden', 'alpha')?1:0),
                     GETPOST('computed_value','alpha'),
                 	(GETPOST('entitycurrentorall', 'alpha')?0:''),
@@ -334,7 +335,7 @@ if ($action == 'update')
     				$params,
     				(GETPOST('alwayseditable', 'alpha')?1:0),
     				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	(GETPOST('list', 'alpha')?1:0),
+                	GETPOST('list', 'alpha'),				// Same as visible -1=not visible by default in list, 1=visible, 0=not visible in list
 					(GETPOST('ishidden', 'alpha')?1:0),
     			    GETPOST('default_value','alpha'),
     				GETPOST('computed_value','alpha'),
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f79198a7096..4c7fb824559 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -140,14 +140,14 @@ class ExtraFields
 	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string			$perms				Permission to check
-	 *  @param	int				$list				Into list view by default
+	 *  @param	int				$list				Into list view by default (-1, 0 or 1)
 	 *  @param	int				$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
 	 *  @param  string  		$computed           Computed value
 	 *  @param  string  		$entity    		 	Entity of extrafields
 	 *  @param  string  		$langfile  		 	Language file
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0, $computed='', $entity='', $langfile='')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $computed='', $entity='', $langfile='')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -279,7 +279,7 @@ class ExtraFields
 	 *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
-	 *  @param	int				$list			Into list view by default
+	 *  @param	int				$list			Into list view by default (-1, 0 or 1)
 	 *  @param	int				$ishidden		Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
 	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
 	 *  @param  string          $computed       Computed value
@@ -287,7 +287,7 @@ class ExtraFields
 	 *  @param	string			$langfile		Language file
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0, $default='', $computed='',$entity='', $langfile='')
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $default='', $computed='',$entity='', $langfile='')
 	{
 		global $conf,$user;
 
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 6c5f563e106..e04f4e0cb92 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -26,6 +26,8 @@
  * $elementtype
  */
 
+$langs->load("modulebuilder");
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_add.tpl.php -->
@@ -101,13 +103,13 @@
 
 			if (type == 'separate')
 			{
-				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true);
+				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.removeAttr('checked').prop('disabled', true);
 				jQuery('#size, #default_value').val('').prop('disabled', true);
 			}
 			else
 			{
 				default_value.removeAttr('disabled');
-				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled');
+				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
     	}
     	init_typeoffields('<?php echo GETPOST('type','alpha'); ?>');
@@ -178,12 +180,9 @@
 <?php if ($conf->multicompany->enabled) { ?>
     <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall','alpha') ? '':' checked'); ?>></td></tr>
 <?php } ?>
-<?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <!-- By default visible into list -->
-<tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
-<?php echo img_info($langs->trans("FeatureNotYetSupported")); ?>
-</td><td class="valeur"><input id="list" type="checkbox" name="list" <?php echo (GETPOST('list','alpha')?' checked':''); ?>></td></tr>
-<?php } ?>
+<tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("ByDefaultInList"), $langs->trans("VisibleDesc")); ?>
+</td><td class="valeur"><input id="list" size="1" type="text" name="list" value="<?php echo GETPOST('list','int')!='' ? GETPOST('list','int') : '1'; ?>"></td></tr>
 </table>
 
 <?php dol_fiche_end(); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 85cfe510df8..def07fa432f 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -25,6 +25,8 @@
  * $elementtype
  */
 
+$langs->load("modulebuilder");
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
@@ -96,13 +98,13 @@
 
 			if (type == 'separate')
 			{
-				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true);
+				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.removeAttr('checked').prop('disabled', true);
 				jQuery('#size, #default_value').val('').prop('disabled', true);
 			}
 			else
 			{
 				default_value.removeAttr('disabled');
-				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled');
+				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
     	}
     	init_typeoffields(jQuery("#type").val());
@@ -238,11 +240,8 @@ else
     <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ?' checked':''); ?>></td></tr>
 <?php } ?>
 <!-- By default visible into list -->
-<?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
-<tr><td><?php echo $langs->trans("ByDefaultInList"); ?>
-<?php echo img_info($langs->trans("FeatureNotYetSupported")); ?>
-</td><td class="valeur"><input id="list" type="checkbox" name="list" <?php echo ($list?' checked':''); ?>></td></tr>
-<?php } ?>
+<tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("ByDefaultInList"), $langs->trans("VisibleDesc")); ?>
+</td><td class="valeur"><input id="list" size="1" type="text" name="list" value="<?php echo ($list!=''?$list:'1'); ?>"></td></tr>
 </table>
 
 <?php dol_fiche_end(); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index f989ce448b5..30b4299a21e 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -22,6 +22,9 @@
  * $extrafield
  * $elementtype
  */
+
+$langs->load("modulebuilder");
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
@@ -48,6 +51,7 @@ print '<td align="center">'.$langs->trans("Unique").'</td>';
 print '<td>'.$langs->trans("ComputedFormula").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
+print '<td align="center">'.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).'</td>';
 if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.$langs->trans("Hidden").'</td>';
 if ($conf->multicompany->enabled)  {
 	print '<td align="center">'.$langs->trans("Entities").'</td>';
@@ -59,7 +63,7 @@ if (count($extrafields->attribute_type))
 {
     foreach($extrafields->attribute_type as $key => $value)
     {
-        
+
         print '<tr class="oddeven">';
         print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
         print "<td>".$extrafields->attribute_label[$key]."</td>\n";
@@ -70,7 +74,8 @@ if (count($extrafields->attribute_type))
         print '<td>'.dol_trunc($extrafields->attribute_computed[$key], 20)."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
-    	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
+        print '<td align="center">'.$extrafields->attribute_list[$key]."</td>\n";
+        if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
     	if ($conf->multicompany->enabled)  {
     		print '<td align="center">'.($extrafields->attribute_entityid[$key]==0?$langs->trans("All"):$extrafields->attribute_entitylabel[$key]).'</td>';
     	}
@@ -83,7 +88,7 @@ else
 {
     $colspan=9;
     if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) $colspan++;
-    
+
     print '<tr class="oddeven">';
     print '<td class="opacitymedium" colspan="'.$colspan.'">';
     print $langs->trans("None");
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
new file mode 100644
index 00000000000..a608cb2da6b
--- /dev/null
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -0,0 +1,40 @@
+<?php
+/* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
+ * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ * $cols
+ */
+?>
+<!-- BEGIN PHP TEMPLATE extrafields_add.tpl.php -->
+<?php
+
+// Other attributes
+$parameters = array();
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	print $object->showOptionals($extrafields, 'edit');
+}
+
+?>
+<!-- END PHP TEMPLATE extrafields_add.tpl.php -->
\ No newline at end of file
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
new file mode 100644
index 00000000000..aa0e30473f1
--- /dev/null
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -0,0 +1,40 @@
+<?php
+/* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
+ * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ * $cols
+ */
+?>
+<!-- BEGIN PHP TEMPLATE extrafields_edit.tpl.php -->
+<?php
+
+// Other attributes
+$parameters = array();
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+	print $object->showOptionals($extrafields, 'edit');
+}
+
+?>
+<!-- END PHP TEMPLATE extrafields_edit.tpl.php -->
\ No newline at end of file
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a5b693aa3f9..7a0a7fabfc7 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -110,7 +110,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 682ecf44839..0c34ff43ef0 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -120,7 +120,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9dca5d1badb..c483dae647f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -119,7 +119,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5f1e564e30b..4b7bcb454cd 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -158,7 +158,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 349726bab5b..9d6c5e4ccd3 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -175,7 +175,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index b2df01afe51..e1af6e30de5 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -261,6 +261,10 @@ ALTER TABLE llx_extrafields ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_extrafields ADD COLUMN datec datetime;
 ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
 
+-- We fix value of 'list' fro m0 to 1 for all extrafields created before this migration
+UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
+
+
 ALTER TABLE llx_extrafields MODIFY COLUMN langs varchar(64);
 
 ALTER TABLE llx_holiday_config MODIFY COLUMN name varchar(128);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 4a5f349215b..f0576367b51 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -81,7 +81,7 @@ class MyObject extends CommonObject
 	    'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-1, 'notnull'=>1,  'index'=>1, 'position'=>1,  'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(64)',  'label'=>'Ref',              'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 	    'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'notnull'=>1,  'index'=>1, 'position'=>20),
-	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1),
+	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1, 'css'=>'minwidth200'),
 	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Amount'),
 		'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-1, 'notnull'=>1,  'position'=>500),
 	    'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1,  'position'=>500),
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 515768b8011..80ccc893bf2 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -280,6 +280,7 @@ if ($action == 'create')
     	print $langs->trans($val['label']);
     	print '</td>';
     	print '<td>';
+    	$defaultcss='minwidth100';
     	if ($val['type'] == 'text')
     	{
     		print '<textarea class="flat quatrevingtpercent" rows="'.ROWS_4.'" name="'.$key.'">';
@@ -292,12 +293,16 @@ if ($action == 'create')
     	}
     	else
     	{
-    		$cssforinput = 'minwidth100';
-    		print '<input class="flat" class="'.$cssforinput.'" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'">';
+    		$cssforinput = empty($val['css'])?$defaultcss:$val['css'];
+    		print '<input class="flat'.($cssforinput?' '.$cssforinput:'').'" class="'.$cssforinput.'" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'">';
     	}
     	print '</td>';
     	print '</tr>';
 	}
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+
 	print '</table>'."\n";
 
 	dol_fiche_end();
@@ -307,8 +312,6 @@ if ($action == 'create')
 	print '</form>';
 }
 
-
-
 // Part to edit record
 if (($id || $ref) && $action == 'edit')
 {
@@ -332,10 +335,11 @@ if (($id || $ref) && $action == 'edit')
     	print '"';
     	print '>'.$langs->trans($val['label']).'</td>';
     	print '<td>';
+    	$defaultcss='minwidth100';
 	    if ($val['type'] == 'text')
     	{
     		print '<textarea class="flat quatrevingtpercent" rows="'.ROWS_4.'" name="'.$key.'">';
-    		print GETPOST($key,'none');
+    		print GETPOST($key,'none')?GETPOST($key,'none'):$object->$key;
     		print '</textarea>';
     	}
 	    elseif (is_array($val['arrayofkeyval']))
@@ -344,12 +348,16 @@ if (($id || $ref) && $action == 'edit')
     	}
     	else
     	{
-    		$cssforinput = 'minwidth100';
-    		print '<input class="flat" class="'.$cssforinput.'" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'">';
+    		$cssforinput = empty($val['css'])?$defaultcss:$val['css'];
+    		print '<input class="flat'.($cssforinput?' '.$cssforinput:'').'" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):$object->$key).'">';
     	}
     	print '</td>';
     	print '</tr>';
 	}
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
+
 	print '</table>';
 
 	dol_fiche_end();
@@ -361,9 +369,6 @@ if (($id || $ref) && $action == 'edit')
 	print '</form>';
 }
 
-
-
-
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
@@ -469,7 +474,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	if ($val['notnull'] > 0) print ' fieldrequired';
     	print '"';
     	print '>'.$langs->trans($val['label']).'</td>';
-    	print '<td><input class="flat" type="text" name="'.$key.'" value="'.(GETPOST($key,'alpha')?GETPOST($key,'alpha'):'').'"></td>';
+    	print '<td>';
+    	print $object->$key;
+		print '</td>';
     	print '</tr>';
 	}
 
@@ -512,6 +519,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
     		}
 
+    		/*
+    		if ($user->rights->sellyoursaas->create)
+    		{
+    			if ($object->status == 1)
+    		 	{
+    		 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=disable">'.$langs->trans("Disable").'</a></div>'."\n";
+    		 	}
+    		 	else
+    		 	{
+    		 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Enable").'</a></div>'."\n";
+    		 	}
+    		}
+    		*/
+
     		if ($user->rights->mymodule->delete)
     		{
     			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 475716114fa..5677ab3baf2 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -130,7 +130,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index a8ce9c404e6..4861fe83ff6 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -100,7 +100,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7d2b1a22b68..71bbee0a016 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -183,7 +183,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 567d60911ae..6c282f12101 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -114,7 +114,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 657e6d610d3..560853ac1c9 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -137,7 +137,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index c730fd074d5..f2da27ea56f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -127,7 +127,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b3bbccfcb4e..85e05c41f96 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -622,7 +622,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    {
 	        foreach($extrafields->attribute_label as $key => $val)
 	        {
-	            $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
 	        }
 	    }
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5009a668ba3..4f8b5513016 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -197,7 +197,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 7ad6c0d1b82..013ad832898 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -157,7 +157,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 04bbbcf8b81..47b8bb4879e 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -105,7 +105,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
 }
 

From 9654c4f16856527eacb8c801e0cb4618a205bc44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 13:29:48 +0200
Subject: [PATCH 24/52] New extrafields are visible into list by default

---
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql  | 2 ++
 htdocs/install/mysql/tables/llx_extrafields.sql | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index e1af6e30de5..a34b5e8cab6 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -264,6 +264,8 @@ ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
 -- We fix value of 'list' fro m0 to 1 for all extrafields created before this migration
 UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
 
+ALTER TABLE llx_extrafields MODIFY COLUMN list integer DEFAULT 1;
+--VPGSQL8.2 ALTER TABLE llx_extrafields ALTER COLUMN list SET DEFAULT 1;
 
 ALTER TABLE llx_extrafields MODIFY COLUMN langs varchar(64);
 
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 3b9a9b2d72b..548508d451d 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -34,7 +34,7 @@ create table llx_extrafields
 	pos             integer DEFAULT 0,
 	alwayseditable  integer DEFAULT 0,							-- 1 if field can be edited whatever is element status
 	param			text,										-- extra parameters to define possible values of field
-	list			integer DEFAULT 0,							-- list of values for field that are combo lists
+	list			integer DEFAULT 1,							-- list of values for field that are combo lists
 	langs			varchar(64),								-- example: fileofmymodule@mymodule
 	ishidden		integer DEFAULT 0,							-- Can be foreign key of external system
 	fk_user_author	integer,									-- user making creation

From abc86d72f645986faab1fd2a072fe173a1aa9fa1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 13:41:59 +0200
Subject: [PATCH 25/52] Module builder

---
 htdocs/modulebuilder/template/myobject_card.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 80ccc893bf2..c30ac858ec8 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -166,8 +166,9 @@ if (empty($reshook))
 	{
 	    foreach ($object->fields as $key => $val)
         {
+            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
             $object->$key=GETPOST($key,'alpha');
-            if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
             if ($val['notnull'] > 0 && $object->$key == '')
             {
                 $error++;
@@ -328,6 +329,7 @@ if (($id || $ref) && $action == 'edit')
 	foreach($object->fields as $key => $val)
 	{
 	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
+
     	print '<tr><td';
     	print ' class="titlefieldcreate';
     	if ($val['notnull'] > 0) print ' fieldrequired';
@@ -344,7 +346,7 @@ if (($id || $ref) && $action == 'edit')
     	}
 	    elseif (is_array($val['arrayofkeyval']))
    		{
-   			print $form->selectarray($key, $val['arrayofkeyval'], GETPOST($key, 'int'));
+   			print $form->selectarray($key, $val['arrayofkeyval'], GETPOST($key, 'int')!=''?GETPOST($key, 'int'):$object->$key);
     	}
     	else
     	{
@@ -468,9 +470,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	foreach($object->fields as $key => $val)
 	{
-	    if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
+	    if (in_array($key, array('rowid', 'ref', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
+
     	print '<tr><td';
-    	print ' class="titlefieldcreate';
+    	print ' class="titlefield';
     	if ($val['notnull'] > 0) print ' fieldrequired';
     	print '"';
     	print '>'.$langs->trans($val['label']).'</td>';

From d2d77d46257685ea23b5755e3234e61e5a1fa940 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 15:19:49 +0200
Subject: [PATCH 26/52] Module builder

---
 .../tpl/document_actions_post_headers.tpl.php |  2 +-
 .../modulebuilder/template/myobject_card.php  | 32 ++++++++++++++++---
 .../template/myobject_document.php            | 16 +++++++---
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index e613c479ee0..da1cb9658a0 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -79,7 +79,7 @@ $formfile->form_attach_new_file(
 );
 
 $disablemove=1;
-if ($modulepart == 'produit') $disablemove=0;
+if ($modulepart == 'product' || $modulepart == 'produit') $disablemove=0;		// Drag and drop for up and down allowed on product
 
 // List of document
 $formfile->list_of_documents(
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index c30ac858ec8..335823cc88b 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -478,13 +478,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	print '"';
     	print '>'.$langs->trans($val['label']).'</td>';
     	print '<td>';
-    	print $object->$key;
+    	print dol_escape_htmltag($object->$key, 1, 1);
 		print '</td>';
     	print '</tr>';
-	}
 
-	// Other attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    	//if ($key == 'targetsrcfile3') break;						// key used for break on second column
+	}
 
 	print '</table>';
 	print '</div>';
@@ -493,7 +492,30 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-	// ...
+	$alreadyoutput = 1;
+	foreach($object->fields as $key => $val)
+	{
+		if ($alreadyoutput)
+		{
+			//if ($key == 'targetsrcfile3') $alreadyoutput = 0;		// key used for break on second column
+			continue;
+		}
+
+		if (in_array($key, array('rowid', 'ref', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
+
+		print '<tr><td';
+		print ' class="titlefield';
+		if ($val['notnull'] > 0) print ' fieldrequired';
+		print '"';
+		print '>'.$langs->trans($val['label']).'</td>';
+		print '<td>';
+		print dol_escape_htmltag($object->$key, 1, 1);
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 0f8ce367bb5..05b76b3d588 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -79,7 +79,9 @@ $extralabels = $extrafields->fetch_name_optionals_label('myobject');
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity] . "/" . $object->id;
+
+//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/packages/" . dol_sanitizeFileName($object->id);
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/packages/" . dol_sanitizeFileName($object->ref);
 
 
 
@@ -167,10 +169,16 @@ if ($object->id)
 
 	dol_fiche_end();
 
-	$modulepart = 'societe';
-	$permission = $user->rights->societe->creer;
-	$permtoedit = $user->rights->societe->creer;
+	$modulepart = 'mymodule';
+	//$permission = $user->rights->mymodule->create;
+	$permission = 1;
+	//$permtoedit = $user->rights->mymodule->create;
+	$permtoedit = 1;
 	$param = '&id=' . $object->id;
+
+	//$relativepathwithnofile='myobject/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile='myobject/' . dol_sanitizeFileName($object->ref).'/';
+
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
 else

From b50a0df6fb5227571bec26d74061035ede775adf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 15:44:43 +0200
Subject: [PATCH 27/52] Tab notes and linked files supported by module builder

---
 .../template/class/myobject.class.php         |  2 ++
 .../template/lib/myobject.lib.php             | 23 +++++++++++++++----
 .../modulebuilder/template/myobject_card.php  |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f0576367b51..e91a9751b60 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -83,6 +83,8 @@ class MyObject extends CommonObject
 	    'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'notnull'=>1,  'index'=>1, 'position'=>20),
 	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1, 'css'=>'minwidth200'),
 	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Amount'),
+		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>45),
+		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>46),
 		'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-1, 'notnull'=>1,  'position'=>500),
 	    'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1,  'position'=>500),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-1, 'position'=>500),
diff --git a/htdocs/modulebuilder/template/lib/myobject.lib.php b/htdocs/modulebuilder/template/lib/myobject.lib.php
index 25f85052133..5ce7c4f7c97 100644
--- a/htdocs/modulebuilder/template/lib/myobject.lib.php
+++ b/htdocs/modulebuilder/template/lib/myobject.lib.php
@@ -29,7 +29,7 @@
  */
 function myobjectPrepareHead($object)
 {
-	global $langs, $conf;
+	global $db, $langs, $conf;
 
 	$langs->load("mymodule@mymodule");
 
@@ -40,17 +40,30 @@ function myobjectPrepareHead($object)
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
-	if (isset($object->fields['note_public']) || isset($object->fields['note_pricate']))
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
 	{
-		$head[$h][0] = dol_buildpath("/mymodule/myobject_note.php", 1).'?id='.$object->id;
-		$head[$h][1] = $langs->trans("Notes");
+		$nbNote = 0;
+		if(!empty($object->fields['note_private'])) $nbNote++;
+		if(!empty($object->fields['note_public'])) $nbNote++;
+		$head[$h][0] = dol_buildpath('/mymodule/myobject_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
 	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->mymodule->dir_output . "/myobject/" . dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = dol_buildpath("/mymodule/myobject_document.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
 	$head[$h][2] = 'document';
 	$h++;
+
 	$head[$h][0] = dol_buildpath("/mymodule/myobject_agenda.php", 1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 335823cc88b..4160b2045fd 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -470,7 +470,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	foreach($object->fields as $key => $val)
 	{
-	    if (in_array($key, array('rowid', 'ref', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
+	    if (in_array($key, array('rowid', 'ref', 'entity', 'note_public', 'note_private', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
 
     	print '<tr><td';
     	print ' class="titlefield';
@@ -501,7 +501,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			continue;
 		}
 
-		if (in_array($key, array('rowid', 'ref', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
+		if (in_array($key, array('rowid', 'ref', 'entity', 'note_public', 'note_private', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key', 'status'))) continue;
 
 		print '<tr><td';
 		print ' class="titlefield';

From 02f069713ebc1c031d8f26a00250cfdda7104cea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Sep 2017 17:43:32 +0200
Subject: [PATCH 28/52] Standardize code

---
 htdocs/core/tpl/notes.tpl.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 45e7dc32697..0d1a0a79339 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -17,15 +17,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// $permission must be defined by caller.
-// $cssclass   must be defined by caller. For example cssclass='fieldtitle"
+// $permissionnote 	must be defined by caller. For example $permissionnote=$user->rights->module->create
+// $cssclass   		must be defined by caller. For example $cssclass='fieldtitle"
 $module       = $object->element;
 $note_public  = 'note_public';
 $note_private = 'note_private';
 
 $colwidth=(isset($colwidth)?$colwidth:(empty($cssclass)?'25':''));
-
-$permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0));    // If already defined by caller page
+// Set $permission from the $permissionnote var defined on calling page
+$permission=(isset($permissionnote)?$permissionnote:(isset($permission)?$permission:(isset($user->rights->$module->create)?$user->rights->$module->create:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0))));
 $moreparam=(isset($moreparam)?$moreparam:'');
 $value_public=$object->note_public;
 $value_private=$object->note_private;

From 0e15aef44f15c07a9800993916c487e9c1b34ac0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 00:30:58 +0200
Subject: [PATCH 29/52] CSS

---
 htdocs/comm/action/card.php           |  9 ++++-----
 htdocs/comm/action/document.php       |  9 ++++-----
 htdocs/comm/action/info.php           | 11 ++++++-----
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/resource/element_resource.php  |  9 ++++-----
 htdocs/theme/eldy/style.css.php       |  9 +++++----
 htdocs/theme/md/style.css.php         |  3 +++
 7 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 78e580a4318..c8b92acd5fc 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1202,14 +1202,13 @@ if ($id > 0)
 
 		// Link to other agenda views
 		$out='';
-		$out.=img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
+		$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-		$out.='<br>';
-		$out.=img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
+		$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-		$out.=img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
+		$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-		$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
+		$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 		$linkback.=$out;
 
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 1e54db9d449..68a36844e39 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -128,14 +128,13 @@ if ($object->id > 0)
 
 	// Link to other agenda views
 	$out='';
-	$out.=img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
+	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-	$out.='<br>';
-	$out.=img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
+	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-	$out.=img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
+	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-	$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
+	$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 	$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 
 	$linkback.=$out;
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 7bee5550453..9bcf1d2b9cd 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -51,6 +51,8 @@ $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|
  * View
  */
 
+$form=new Form($db);
+
 $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 
@@ -66,14 +68,13 @@ $linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("B
 
 // Link to other agenda views
 $out='';
-$out.=img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
+$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
 $out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-$out.='<br>';
-$out.=img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
+$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
 $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-$out.=img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
+$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
 $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
+$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 
 $linkback.=$out;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8db18e2c748..f33ab83ee29 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5973,7 +5973,7 @@ class Form
 
 		if ($previous_ref || $next_ref || $morehtml)
 		{
-			$ret.='<div class="pagination"><ul>';
+			$ret.='<div class="pagination paginationref"><ul class="right">';
 		}
         if ($morehtml)
         {
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 550fa9a6898..e10fc07a6ef 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -205,14 +205,13 @@ else
 
 			// Link to other agenda views
 			$out='';
-			$out.=img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
+			$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"');
 			$out.='<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($act->datep,'%Y').'&month='.dol_print_date($act->datep,'%m').'&day='.dol_print_date($act->datep,'%d').'">'.$langs->trans("ViewPerUser").'</a>';
-			$out.='<br>';
-			$out.=img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
+			$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone pictoactionview"');
 			$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($act->datep,'%Y').'&month='.dol_print_date($act->datep,'%m').'&day='.dol_print_date($act->datep,'%d').'">'.$langs->trans("ViewCal").'</a>';
-			$out.=img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
+			$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"');
 			$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($act->datep,'%Y').'&month='.dol_print_date($act->datep,'%m').'&day='.dol_print_date($act->datep,'%d').'">'.$langs->trans("ViewWeek").'</a>';
-			$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
+			$out.='</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 			$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($act->datep,'%Y').'&month='.dol_print_date($act->datep,'%m').'&day='.dol_print_date($act->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 
 			$linkback.=$out;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 71f741a907b..36a92396d3e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1233,6 +1233,9 @@ div.heightref {
 div.divphotoref {
 	padding-right: 20px;
 }
+div.paginationref {
+	padding-bottom: 10px;
+}
 div.statusref {
 	float: right;
 	padding-left: 12px;
@@ -2933,13 +2936,11 @@ span.dashboardlineko {
 	float: right;
 	position: relative;
     text-align: right;
-    top: -24px;
-    padding: 1px 2px 1px 2px;
+    top: -26px;
+    padding: 0px 5px 0px 5px;
     border-radius: .25em;
 
     background-color: #9f4705;
-    padding: 0px 5px 0px 5px;
-    top: -26px;
 }
 .imglatecoin {
     padding: 1px 3px 1px 1px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 02705f63801..e29b3a7c9d3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1273,6 +1273,9 @@ div.heightref {
 div.divphotoref {
 	padding-right: 20px;
 }
+div.paginationref {
+	padding-bottom: 10px;
+}
 div.statusref {
 	float: right;
 	padding-left: 12px;

From 0feae17ef54924e019faada7d9dd82dc9dbdb5f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 11:51:34 +0200
Subject: [PATCH 30/52] Fix file not always defined

---
 htdocs/core/modules/rapport/pdf_paiement.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 35ffc399372..54f0e418eb0 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -122,6 +122,8 @@ class pdf_paiement
 
 		$month = sprintf("%02d",$month);
 		$year = sprintf("%04d",$year);
+
+		$file = $dir . "/payments-".$year."-".$month.".pdf";
 		switch ($this->doc_type) {
             case "client":
                 $file = $dir . "/payments-".$year."-".$month.".pdf";
@@ -251,7 +253,7 @@ class pdf_paiement
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($result);
-				
+
 
 				$lines[$i][0] = $objp->facnumber;
 				$lines[$i][1] = dol_print_date($this->db->jdate($objp->dp),"day",false,$outputlangs,true);
@@ -328,9 +330,9 @@ class pdf_paiement
 
 		if (! empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
-		
+
 		$this->result = array('fullpath'=>$file);
-		
+
 		return 1;
 	}
 

From fa6c3eff80f3415c546df74e429c646ac6cdd58a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 12:53:24 +0200
Subject: [PATCH 31/52] More PHPunit on invoice deletion

---
 htdocs/compta/facture/class/facture.class.php | 30 +++++++++++------
 test/phpunit/FactureTest.php                  | 33 +++++++++++++++++--
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b7603400c61..b22816f1473 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1737,7 +1737,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user      	    User making the deletion.
 	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						<0 if KO, 0=Refused, >0 if OK
 	 */
 	function delete($user, $notrigger=0, $idwarehouse=-1)
 	{
@@ -1748,9 +1748,13 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
 
-		// TODO Test if there is at least one payment. If yes, refuse to delete.
+		// Test to avoid invoice deletion (allowed if draft)
+		$test = $this->is_erasable();
+
+		if ($test <= 0) return $test;
 
 		$error=0;
+
 		$this->db->begin();
 
 		if (! $error && ! $notrigger)
@@ -3356,9 +3360,9 @@ class Facture extends CommonInvoice
 	/**
 	 *  Return if an invoice can be deleted
 	 *	Rule is:
-	 *	If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can
-	 *  If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
 	 *  If invoice is draft and ha a temporary ref -> yes
+	 *	If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can. If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on, we can't.
+	 *  If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
 	 *
 	 *  @return    int         <0 if KO, 0=no, 1=yes
 	 */
@@ -3366,30 +3370,36 @@ class Facture extends CommonInvoice
 	{
 		global $conf;
 
+		// on verifie si la facture est en numerotation provisoire
+		$facref = substr($this->ref, 1, 4);
+
+		if ($this->statut == self::STATUS_DRAFT && $facref == 'PROV') // If draft invoice and ref not yet defined
+		{
+			return 1;
+		}
+
 		if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 1;
 		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED))  return 0;
 
-		// on verifie si la facture est en numerotation provisoire
-		$facref = substr($this->ref, 1, 4);
+		// TODO Test if there is at least one payment. If yes, refuse to delete.
+		// ...
 
 		// If not a draft invoice and not temporary invoice
 		if ($facref != 'PROV')
 		{
 			$maxfacnumber = $this->getNextNumRef($this->thirdparty,'last');
 			$ventilExportCompta = $this->getVentilExportCompta();
+
 			// If there is no invoice into the reset range and not already dispatched, we can delete
 			if ($maxfacnumber == '' && $ventilExportCompta == 0) return 1;
 			// If invoice to delete is last one and not already dispatched, we can delete
 			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 1;
+
 			if ($this->situation_cycle_ref) {
 				$last = $this->is_last_in_cycle();
 				return $last;
 			}
 		}
-		else if ($this->statut == self::STATUS_DRAFT && $facref == 'PROV') // Si facture brouillon et provisoire
-		{
-			return 1;
-		}
 
 		return 0;
 	}
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 8c3d4a2374a..eed67935032 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -272,12 +272,41 @@ class FactureTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
+        // Force default setup
+        unset($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED);
+        unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
+
         $localobject=new Facture($this->savdb);
         $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
 
+        // Create another invoice and validate it after $localobject
+        $localobject2=new Facture($this->savdb);
+        $result=$localobject2->initAsSpecimen();
+        $result=$localobject2->create($user);
+        $result=$localobject2->validate($user);
+		print 'Invoice localobject ref = '.$localobject->ref."\n";
+        print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
+
+        $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
+
+        $result=$localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
         print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result);
+        $this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
+
+        unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
+
+        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
+
+        $result=$localobject2->delete($user);					// Deletion is OK, it is last invoice
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
+
+        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
+
         return $result;
     }
 

From 95cc007b39d78c4d78ae8759836478af24a67c40 Mon Sep 17 00:00:00 2001
From: Nicolas Leichtle <software@nico-leichtle.de>
Date: Sat, 30 Sep 2017 15:40:17 +0200
Subject: [PATCH 32/52] NEW: Add project related fields to ODT

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 535200ab95a..91da8072922 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -418,6 +418,21 @@ abstract class CommonDocGenerator
 			$resarray[$array_key.'_total_discount_ht'] = '';
 		}
 
+		// Fetch project information if there is a project assigned to this object
+		if ($object->element != "project" && $object->fk_project > 0)
+		{
+			if(!isset($object->project))
+			{
+				$object->fetch_projet();
+			}
+			
+			$resarray[$array_key.'_project_ref'] = $object->project->ref;
+			$resarray[$array_key.'_project_title'] = $object->project->title;
+			$resarray[$array_key.'_project_description'] = $object->project->description;
+			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
+			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
+		}
+
 		// Add vat by rates
 		if (is_array($object->lines) && count($object->lines)>0)
 		{

From 9ba8b9bf7e884645c08b6166de61e9e2ef230be3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 18:19:20 +0200
Subject: [PATCH 33/52] Fix stay on create form if creation fails

---
 htdocs/societe/card.php | 244 ++++++++++++++++++++--------------------
 1 file changed, 120 insertions(+), 124 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 89074892fa9..866fbf64942 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -310,159 +310,155 @@ if (empty($reshook))
         {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
             $error++;
-            $action=($action=='add'?'create':'edit');
         }
         if (GETPOST('client') < 0)
         {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
             $error++;
-            $action=($action=='add'?'create':'edit');
         }
         if (GETPOST('fournisseur') < 0)
         {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
             $error++;
-            $action=($action=='add'?'create':'edit');
+
         }
 
-        if ($action == 'update')
+        if ($error)
         {
-        	$ret=$object->fetch($socid);
-			$object->oldcopy = clone $object;
-        }
-		else $object->canvas=$canvas;
+	        if ($action == 'update')
+	        {
+	        	$ret=$object->fetch($socid);
+				$object->oldcopy = clone $object;
+	        }
+			else $object->canvas=$canvas;
 
-        if (GETPOST("private") == 1)	// Ask to create a contact
-        {
-            $object->particulier       = GETPOST("private");
+	        if (GETPOST("private") == 1)	// Ask to create a contact
+	        {
+	            $object->particulier       = GETPOST("private");
 
-            $object->name              = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
-            $object->civility_id       = GETPOST('civility_id');	// Note: civility id is a code, not an int
-            // Add non official properties
-            $object->name_bis          = GETPOST('name','alpha');
-            $object->firstname         = GETPOST('firstname','alpha');
-        }
-        else
-        {
-            $object->name              = GETPOST('name', 'alpha');
-        }
-        $object->name_alias            = GETPOST('name_alias');
-        $object->address               = GETPOST('address');
-        $object->zip                   = GETPOST('zipcode', 'alpha');
-        $object->town                  = GETPOST('town', 'alpha');
-        $object->country_id            = GETPOST('country_id', 'int');
-        $object->state_id              = GETPOST('state_id', 'int');
-        $object->skype                 = GETPOST('skype', 'alpha');
-        $object->phone                 = GETPOST('phone', 'alpha');
-        $object->fax                   = GETPOST('fax','alpha');
-        $object->email                 = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-        $object->url                   = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-        $object->idprof1               = trim(GETPOST('idprof1', 'alpha'));
-        $object->idprof2               = trim(GETPOST('idprof2', 'alpha'));
-        $object->idprof3               = trim(GETPOST('idprof3', 'alpha'));
-        $object->idprof4               = trim(GETPOST('idprof4', 'alpha'));
-        $object->idprof5               = trim(GETPOST('idprof5', 'alpha'));
-        $object->idprof6               = trim(GETPOST('idprof6', 'alpha'));
-        $object->prefix_comm           = GETPOST('prefix_comm', 'alpha');
-        $object->code_client           = GETPOST('code_client', 'alpha');
-        $object->code_fournisseur      = GETPOST('code_fournisseur', 'alpha');
-        $object->capital               = GETPOST('capital', 'alpha');
-        $object->barcode               = GETPOST('barcode', 'alpha');
+	            $object->name              = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
+	            $object->civility_id       = GETPOST('civility_id');	// Note: civility id is a code, not an int
+	            // Add non official properties
+	            $object->name_bis          = GETPOST('name','alpha');
+	            $object->firstname         = GETPOST('firstname','alpha');
+	        }
+	        else
+	        {
+	            $object->name              = GETPOST('name', 'alpha');
+	        }
+	        $object->name_alias            = GETPOST('name_alias');
+	        $object->address               = GETPOST('address');
+	        $object->zip                   = GETPOST('zipcode', 'alpha');
+	        $object->town                  = GETPOST('town', 'alpha');
+	        $object->country_id            = GETPOST('country_id', 'int');
+	        $object->state_id              = GETPOST('state_id', 'int');
+	        $object->skype                 = GETPOST('skype', 'alpha');
+	        $object->phone                 = GETPOST('phone', 'alpha');
+	        $object->fax                   = GETPOST('fax','alpha');
+	        $object->email                 = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+	        $object->url                   = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+	        $object->idprof1               = trim(GETPOST('idprof1', 'alpha'));
+	        $object->idprof2               = trim(GETPOST('idprof2', 'alpha'));
+	        $object->idprof3               = trim(GETPOST('idprof3', 'alpha'));
+	        $object->idprof4               = trim(GETPOST('idprof4', 'alpha'));
+	        $object->idprof5               = trim(GETPOST('idprof5', 'alpha'));
+	        $object->idprof6               = trim(GETPOST('idprof6', 'alpha'));
+	        $object->prefix_comm           = GETPOST('prefix_comm', 'alpha');
+	        $object->code_client           = GETPOST('code_client', 'alpha');
+	        $object->code_fournisseur      = GETPOST('code_fournisseur', 'alpha');
+	        $object->capital               = GETPOST('capital', 'alpha');
+	        $object->barcode               = GETPOST('barcode', 'alpha');
 
-        $object->tva_intra             = GETPOST('tva_intra', 'alpha');
-        $object->tva_assuj             = GETPOST('assujtva_value', 'alpha');
-        $object->status                = GETPOST('status', 'alpha');
+	        $object->tva_intra             = GETPOST('tva_intra', 'alpha');
+	        $object->tva_assuj             = GETPOST('assujtva_value', 'alpha');
+	        $object->status                = GETPOST('status', 'alpha');
 
-        // Local Taxes
-        $object->localtax1_assuj       = GETPOST('localtax1assuj_value', 'alpha');
-        $object->localtax2_assuj       = GETPOST('localtax2assuj_value', 'alpha');
+	        // Local Taxes
+	        $object->localtax1_assuj       = GETPOST('localtax1assuj_value', 'alpha');
+	        $object->localtax2_assuj       = GETPOST('localtax2assuj_value', 'alpha');
 
-        $object->localtax1_value	   = GETPOST('lt1', 'alpha');
-        $object->localtax2_value	   = GETPOST('lt2', 'alpha');
+	        $object->localtax1_value	   = GETPOST('lt1', 'alpha');
+	        $object->localtax2_value	   = GETPOST('lt2', 'alpha');
 
-        $object->forme_juridique_code  = GETPOST('forme_juridique_code', 'int');
-        $object->effectif_id           = GETPOST('effectif_id', 'int');
-        $object->typent_id             = GETPOST('typent_id','int');
+	        $object->forme_juridique_code  = GETPOST('forme_juridique_code', 'int');
+	        $object->effectif_id           = GETPOST('effectif_id', 'int');
+	        $object->typent_id             = GETPOST('typent_id','int');
 
-        $object->typent_code           = dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
+	        $object->typent_code           = dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
 
-        $object->client                = GETPOST('client', 'int');
-        $object->fournisseur           = GETPOST('fournisseur', 'int');
+	        $object->client                = GETPOST('client', 'int');
+	        $object->fournisseur           = GETPOST('fournisseur', 'int');
 
-        $object->commercial_id         = GETPOST('commercial_id', 'int');
-        $object->default_lang          = GETPOST('default_lang');
+	        $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');
+	        // Webservices url/key
+	        $object->webservices_url       = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+	        $object->webservices_key       = GETPOST('webservices_key', 'san_alpha');
 
-		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
-			$object->fk_incoterms 		   = GETPOST('incoterm_id', 'int');
-			$object->location_incoterms    = GETPOST('location_incoterms', 'alpha');
-		}
+			// Incoterms
+			if (!empty($conf->incoterm->enabled))
+			{
+				$object->fk_incoterms 		   = GETPOST('incoterm_id', 'int');
+				$object->location_incoterms    = GETPOST('location_incoterms', 'alpha');
+			}
 
-		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
-			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-		}
+			// Multicurrency
+			if (!empty($conf->multicurrency->enabled))
+			{
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+			}
 
-        // Fill array 'array_options' with data from add form
-        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0)
-		{
-			 $error++;
-			 $action = ($action=='add'?'create':'edit');
-		}
+	        // Fill array 'array_options' with data from add form
+	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0)
+			{
+				 $error++;
+			}
 
-        if (GETPOST('deletephoto')) $object->logo = '';
-        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        if (GETPOST('deletephoto')) $object->logo = '';
+	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-        // Check parameters
-        if (! GETPOST('cancel','alpha'))
-        {
-            if (! empty($object->email) && ! isValidEMail($object->email))
-            {
-                $langs->load("errors");
-                $error++;
-                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
-                $action = ($action=='add'?'create':'edit');
-            }
-            if (! empty($object->url) && ! isValidUrl($object->url))
-            {
-                $langs->load("errors");
-                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
-                $action = ($action=='add'?'create':'edit');
-            }
-            if ($object->fournisseur && ! $conf->fournisseur->enabled)
-            {
-                $langs->load("errors");
-                setEventMessages('', $langs->trans("ErrorSupplierModuleNotEnabled"), 'errors');
-                $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');
-                }
-            }
+	        // Check parameters
+	        if (! GETPOST('cancel','alpha'))
+	        {
+	            if (! empty($object->email) && ! isValidEMail($object->email))
+	            {
+	                $langs->load("errors");
+	                $error++;
+	                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
+	            }
+	            if (! empty($object->url) && ! isValidUrl($object->url))
+	            {
+	                $langs->load("errors");
+	                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
+	            }
+	            if ($object->fournisseur && ! $conf->fournisseur->enabled)
+	            {
+	                $langs->load("errors");
+	                setEventMessages('', $langs->trans("ErrorSupplierModuleNotEnabled"), 'errors');
+	            }
+	            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);
+	                }
+	            }
 
-            // We set country_id, country_code and country for the selected country
-            $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
-            if ($object->country_id)
-            {
-            	$tmparray=getCountry($object->country_id,'all');
-            	$object->country_code=$tmparray['code'];
-            	$object->country=$tmparray['label'];
-            }
+	            // We set country_id, country_code and country for the selected country
+	            $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
+	            if ($object->country_id)
+	            {
+	            	$tmparray=getCountry($object->country_id,'all');
+	            	$object->country_code=$tmparray['code'];
+	            	$object->country=$tmparray['label'];
+	            }
+	        }
         }
 
         if (! $error)

From 976cbd5f83383c344074a23cb8bf279330450867 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 18:52:33 +0200
Subject: [PATCH 34/52] Fix javascript error and input field for password
 extrafield in list

---
 htdocs/core/class/extrafields.class.php |  3 ++-
 htdocs/core/js/lib_head.js.php          | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4c7fb824559..bae3020385f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1323,7 +1323,8 @@ class ExtraFields
 		}
 		elseif ($type == 'password')
 		{
-			$out='<input type="password" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			// If prefix is 'search_', field is used as a filter, we use a common text field.
+			$out='<input type="'.($keysuffix=='search_'?'text':'password').'" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
 		}
 		if (!empty($hidden)) {
 			$out='<input type="hidden" value="'.$value.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="'.$keysuffix.'options_'.$key.$keyprefix.'"/>';
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 7ed49d004d2..9f8e64a7847 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -506,26 +506,26 @@ function getDateFromFormat(val,format)
         if (substr == "MM" ||substr == "M")
         {
             month=getIntegerInString(val,d,1,2);
-            d -= 2- month.length;
+            if (month) d -= 2- month.length;
         }
         if (substr == "dd")
         {
             day=getIntegerInString(val,d,1,2);
-            d -= 2- day.length;
+            if (day) d -= 2- day.length;
         }
         if (substr == "HH" ||substr == "hh" )
         {
             hour=getIntegerInString(val,d,1,2);
-            d -= 2- hour.length;
+            if (dhouray) d -= 2- hour.length;
         }
         if (substr == "mm"){
             minute=getIntegerInString(val,d,1,2);
-            d -= 2- minute.length;
+            if (minute) d -= 2- minute.length;
         }
         if (substr == "ss")
         {
             seconde=getIntegerInString(val,d,1,2);
-            d -= 2- seconde.length;
+            if (seconde) d -= 2- seconde.length;
         }
 
 		i+=substr.length;

From a43dcbd0c55dab97d233c60997f37fd0f2d1955d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 18:57:21 +0200
Subject: [PATCH 35/52] Fix no "now" link on search of a date extrafield in
 list

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bae3020385f..c8779b388c0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -893,7 +893,7 @@ class ExtraFields
 			if (! is_object($form)) $form=new Form($this->db);
 
 			// TODO Must also support $moreparam
-			$out = $form->select_date($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1);
+			$out = $form->select_date($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, ($keysuffix != 'search_' ? 1 : 0), 1, 0, 1);
 		}
 		elseif (in_array($type,array('int')))
 		{

From 47c0231fb8520b8e5a78307b016052b66febe275 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 19:12:12 +0200
Subject: [PATCH 36/52] Fix error management

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 866fbf64942..f5157f3b6ad 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -323,9 +323,9 @@ if (empty($reshook))
 
         }
 
-        if ($error)
+        if (! $error)
         {
-	        if ($action == 'update')
+        	if ($action == 'update')
 	        {
 	        	$ret=$object->fetch($socid);
 				$object->oldcopy = clone $object;

From e23a88732eef14fa0a57672efe21838d49c7f34e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 20:05:34 +0200
Subject: [PATCH 37/52] Fix default value on extrafields

---
 htdocs/core/class/commonobject.class.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bd6f658185d..ac2c1482682 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4594,23 +4594,28 @@ abstract class CommonObject
 				}else {
 					$colspan='3';
 				}
+
 				switch($mode) {
 					case "view":
 						$value=$this->array_options["options_".$key];
 						break;
 					case "edit":
-						if (isset($_POST["options_" . $key])) {
-							if (is_array($_POST["options_" . $key])) {
-								// $_POST["options"] is an array but following code expects a comma separated string
-								$value = implode(",", $_POST["options_" . $key]);
+						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
+						$getposttemp = GETPOST('options_'.$key, 'none');				// GETPOST can get value from GET, POST or setup of default values.
+						if (isset($getposttemp)) {
+							if (is_array($getposttemp)) {
+								// $getposttemp is an array but following code expects a comma separated string
+								$value = implode(",", $getposttemp);
 							} else {
-								$value = $_POST["options_" . $key];
+								$value = $getposttemp;
 							}
 						} else {
-							$value = $this->array_options["options_" . $key];
+							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
 						}
 						break;
 				}
+				//var_dump($value);
+
 				if ($extrafields->attribute_type[$key] == 'separate')
 				{
 					$out .= $extrafields->showSeparator($key);

From 2c1f1ec651610d028dddf81496fea37a2a4c927d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 20:31:20 +0200
Subject: [PATCH 38/52] Try to fix autocomplete

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f5157f3b6ad..4ad8462406e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -988,7 +988,7 @@ else
 
         dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
 
-        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="formsoc" autocomplete="off">';		// Chrome ignor autocomplete
 
         print '<input type="hidden" name="action" value="add">';
         print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

From b7810d95b93c8d9c3a40a2c338d522116299222f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Sep 2017 20:43:15 +0200
Subject: [PATCH 39/52] Fix permissions

---
 htdocs/core/lib/security.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 581c324674a..c02fbbbb220 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -252,7 +252,8 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
                 if (empty($user->rights->$feature->creer)
-                && empty($user->rights->$feature->write)) { $createok=0; $nbko++; }
+                && empty($user->rights->$feature->write)
+                && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
             }
         }
 

From 3ddd5d3d3aeb0b5c1752a61cd54b4d189078d7ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Oct 2017 14:54:17 +0200
Subject: [PATCH 40/52] The default value feature is sensitive to url
 parameters.

---
 htdocs/core/lib/functions.lib.php | 293 ++++++++++++++++--------------
 htdocs/langs/en_US/admin.lang     |   4 +-
 htdocs/societe/card.php           |   2 -
 htdocs/user/class/user.class.php  |  16 +-
 4 files changed, 169 insertions(+), 146 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c252df5070e..16f93c3e2cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -312,111 +312,126 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 	    {
 	    	if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 	            {
-					$qualified=1;
-                	if (isset($user->default_values[$relativepathstring]['createform_queries']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
-                	{
-                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['createform_queries']);
-                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-                		{
-                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-                		}
-                	}
-					if ($qualified)
+					if (isset($user->default_values[$relativepathstring]['createform']))
 					{
-		            	//var_dump($user->default_values[$relativepathstring]['createform']);
-		                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+						foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
+						{
+							$qualified = 0;
+							if ($defkey != '_noquery_')
+							{
+								$tmpqueryarraytohave=explode('&', $defkey);
+								$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+								$foundintru=0;
+								foreach($tmpqueryarraytohave as $tmpquerytohave)
+								{
+									if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+								}
+								if (! $foundintru) $qualified=1;
+								//var_dump($defkey.'-'.$qualified);
+							}
+							else $qualified = 1;
+
+							if ($qualified)
+							{
+				            	//var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
+				                if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname]))
+				                {
+				                	$out = $user->default_values[$relativepathstring]['createform'][$defkey][$paramname];
+				                	break;
+				                }
+							}
+						}
 					}
-	            }
+				}
 	        }
 	        // Management of default search_filters and sort order
 	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 	            {
 	                //var_dump($user->default_values[$relativepathstring]);
-	                if ($paramname == 'sortfield')			// Sorted on which fields ?
+	                if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
 	                {
-	                	$qualified=1;
-	                	if (isset($user->default_values[$relativepathstring]['sortorder_queries']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
+	                	if (isset($user->default_values[$relativepathstring]['sortorder']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
 	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['sortorder_queries']);
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
+	                		foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
 	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-	                		}
-	                	}
-						if ($qualified)
-						{
-		                	if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the key of $user->default_values[path][sortorder]
-		                    {
-		                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-		                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-		                        {
-		                            if ($out) $out.=', ';
-		                            $out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
-		                        }
+	                			$qualified = 0;
+	                			if ($defkey != '_noquery_')
+	                			{
+	                				$tmpqueryarraytohave=explode('&', $defkey);
+	                				$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+	                				$foundintru=0;
+	                				foreach($tmpqueryarraytohave as $tmpquerytohave)
+	                				{
+	                					if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+	                				}
+	                				if (! $foundintru) $qualified=1;
+	                				//var_dump($defkey.'-'.$qualified);
+	                			}
+	                			else $qualified = 1;
+
+	                			if ($qualified)
+	                			{
+		                        	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+		                        	foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
+		                        	{
+		                        		if ($out) $out.=', ';
+		                        		if ($paramname == 'sortfield')
+		                        		{
+	                            			$out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
+		                        		}
+	                        			if ($paramname == 'sortorder')
+	                        			{
+		                        			$out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
+		                        		}
+		                        	}
+	                            	//break;	// No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?)
+	                			}
 		                    }
 						}
 	                }
-	                elseif ($paramname == 'sortorder')		// ASC or DESC ?
+	                elseif (isset($user->default_values[$relativepathstring]['filters']))
 	                {
-	                	$qualified=1;
-	                	if (isset($user->default_values[$relativepathstring]['sortorder_queries']))
+	                	foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
 	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['sortorder_queries']);
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-	                		}
-	                	}
-						if ($qualified)
-						{
-		                	if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the val of $user->default_values[path][sortorder]
-		                    {
-		                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-		                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-		                        {
-		                            if ($out) $out.=', ';
-		                            $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
-		                        }
-		                    }
-						}
-	                }
-	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
-	                {
-	                	$qualified=1;
-	                	if (isset($user->default_values[$relativepathstring]['filters_queries']))
-	                	{
-	                		$tmpqueryarraytohave=explode('&', $user->default_values[$relativepathstring]['filters_queries']);
-	                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-	                		foreach($tmpqueryarraytohave as $tmpquerytohave)
-	                		{
-	                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $qualified=0;
-	                		}
-	                	}
-						if ($qualified)
-						{
-		                	if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
+		                	$qualified = 0;
+		                	if ($defkey != '_noquery_')
 		                	{
-		                		// We made a search from quick search menu, do we still use default filter ?
-		                		if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
+		                		$tmpqueryarraytohave=explode('&', $defkey);
+		                		$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+		                		$foundintru=0;
+		                		foreach($tmpqueryarraytohave as $tmpquerytohave)
 		                		{
-		                    		$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-		                    		$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
+		                			if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
 		                		}
+		                		if (! $foundintru) $qualified=1;
+		                		//var_dump($defkey.'-'.$qualified);
 		                	}
-		                	else
-		                	{
-		                    	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-		                    	$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
-		                	}
-						}
+		                	else $qualified = 1;
+
+							if ($qualified)
+							{
+			                	if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
+			                	{
+			                		// We made a search from quick search menu, do we still use default filter ?
+			                		if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
+			                		{
+			                    		$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+			                    		$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+			                		}
+			                	}
+			                	else
+			                	{
+			                    	$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+			                    	$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+			                	}
+			                	break;
+							}
+	                	}
 	                }
 	            }
 	        }
@@ -424,14 +439,14 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 
 	}
 
-	    // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
-	    // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
-	    // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
-	    if (! is_array($out) && empty($_POST[$paramname]))
+	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
+	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
+	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
+	if (! is_array($out) && empty($_POST[$paramname]))
+	{
+	    $maxloop=20; $loopnb=0;    // Protection against infinite loop
+	    while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	    {
-	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
-	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
-	        {
 	            $loopnb++; $newout = '';
 
     	        if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
@@ -462,57 +477,57 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
     	        else $newout = '';     // Key not found, we replace with empty string
     	        //var_dump('__'.$reg[1].'__ -> '.$newout);
     	        $out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
-	        }
 	    }
+	}
 
-	    // Check is done after replacement
-	    switch ($check)
-	    {
-	        case 'none':
-	            break;
-	        case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
-	            if (! is_numeric($out)) { $out=''; }
-	            break;
-	        case 'intcomma':
-	            if (preg_match('/[^0-9,]+/i',$out)) $out='';
-	            break;
-	        case 'alpha':
-	            $out=trim($out);
-	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-	            // '../' is dangerous because it allows dir transversals
-	            if (preg_match('/"/',$out)) $out='';
-	            else if (preg_match('/\.\.\//',$out)) $out='';
-	            break;
-	        case 'san_alpha':
-	            $out=filter_var($out,FILTER_SANITIZE_STRING);
-	            break;
-	        case 'aZ':
-	            $out=trim($out);
-	            if (preg_match('/[^a-z]+/i',$out)) $out='';
-	            break;
-	        case 'aZ09':
-	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
-	            break;
-	        case 'array':
-	            if (! is_array($out) || empty($out)) $out=array();
-	            break;
-			case 'nohtml':
-			    $out=dol_string_nohtmltag($out);
-				break;
-			case 'alphanohtml':	// Recommended for search params
-	            $out=trim($out);
-	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-	            // '../' is dangerous because it allows dir transversals
-	            if (preg_match('/"/',$out)) $out='';
-	            else if (preg_match('/\.\.\//',$out)) $out='';
-			    $out=dol_string_nohtmltag($out);
-				break;
-			case 'custom':
-	            if (empty($filter)) return 'BadFourthParameterForGETPOST';
-	            $out=filter_var($out, $filter, $options);
-	            break;
-	    }
+    // Check is done after replacement
+    switch ($check)
+    {
+        case 'none':
+            break;
+        case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
+            if (! is_numeric($out)) { $out=''; }
+            break;
+        case 'intcomma':
+            if (preg_match('/[^0-9,]+/i',$out)) $out='';
+            break;
+        case 'alpha':
+            $out=trim($out);
+            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+            // '../' is dangerous because it allows dir transversals
+            if (preg_match('/"/',$out)) $out='';
+            else if (preg_match('/\.\.\//',$out)) $out='';
+            break;
+        case 'san_alpha':
+            $out=filter_var($out,FILTER_SANITIZE_STRING);
+            break;
+        case 'aZ':
+            $out=trim($out);
+            if (preg_match('/[^a-z]+/i',$out)) $out='';
+            break;
+        case 'aZ09':
+            $out=trim($out);
+            if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+            break;
+        case 'array':
+            if (! is_array($out) || empty($out)) $out=array();
+            break;
+		case 'nohtml':
+		    $out=dol_string_nohtmltag($out);
+			break;
+		case 'alphanohtml':	// Recommended for search params
+            $out=trim($out);
+            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+            // '../' is dangerous because it allows dir transversals
+            if (preg_match('/"/',$out)) $out='';
+            else if (preg_match('/\.\.\//',$out)) $out='';
+		    $out=dol_string_nohtmltag($out);
+			break;
+		case 'custom':
+            if (empty($filter)) return 'BadFourthParameterForGETPOST';
+            $out=filter_var($out, $filter, $options);
+            break;
+    }
 
     // Code for search criteria persistence.
 	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3c10edc86ca..da8188e7a75 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -452,8 +452,8 @@ DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If we want default only if url has some parameter, we can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If we want default only if url has some parameter, we can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
 EnableOverwriteTranslation=Enable usage of overwrote translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 4ad8462406e..dc02303e3bb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -94,8 +94,6 @@ if (! empty($canvas))
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
 
 
-
-
 /*
  * Actions
  */
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 40124109961..b76013c8ab4 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -384,7 +384,9 @@ class User extends CommonObject
 			    {
 			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param))
 			        {
-			        	// $obj->page is relative URL with or without params, $obj->type can be 'filters', 'sortorder', 'createform', ...
+			        	// $obj->page is relative URL with or without params
+			        	// $obj->type can be 'filters', 'sortorder', 'createform', ...
+			        	// $obj->param is key or param
 			        	$pagewithoutquerystring=$obj->page;
 			        	$pagequeries='';
 			        	if (preg_match('/^([^\?]+)\?(.*)$/', $pagewithoutquerystring, $reg))	// There is query param
@@ -392,10 +394,18 @@ class User extends CommonObject
 			        		$pagewithoutquerystring=$reg[1];
 			        		$pagequeries=$reg[2];
 			        	}
-			        	$this->default_values[$pagewithoutquerystring][$obj->type][$obj->param]=$obj->value;
-			            if ($pagequeries) $this->default_values[$pagewithoutquerystring][$obj->type.'_queries']=$pagequeries;
+			        	$this->default_values[$pagewithoutquerystring][$obj->type][$pagequeries?$pagequeries:'_noquery_'][$obj->param]=$obj->value;
+			            //if ($pagequeries) $this->default_values[$pagewithoutquerystring][$obj->type.'_queries']=$pagequeries;
 			        }
 			    }
+			    // Sort by key, so _noquery_ is last
+			    foreach($this->default_values as $a => $b)
+			    {
+			    	foreach($b as $c => $d)
+			    	{
+			    		krsort($this->default_values[$a][$c]);
+			    	}
+			    }
 			    $this->db->free($resql);
 			}
 			else

From b3939f12b9a991611a640bcbffaf655cf02769f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Oct 2017 15:06:43 +0200
Subject: [PATCH 41/52] Enhance the default value feature

---
 htdocs/admin/defaultvalues.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index b758506f8b5..e4ba112511e 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -269,12 +269,12 @@ if ($mode != 'focus')
 {
     if ($mode != 'sortorder')
     {
-        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object')); // Must match list into GETPOST
-        $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+        $substitutionarray=getCommonSubstitutionArray($langs, 2, array('object','objectamount')); // Must match list into GETPOST
+		unset($substitutionarray['__USER_SIGNATURE__']);
         $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
         foreach($substitutionarray as $key => $val)
         {
-            $texthelp.=$key.'<br>';
+            $texthelp.=$key.' -> '.$val.'<br>';
         }
         $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');    // No tooltip on click, this also triggers the sort click
     }

From f785203c0daab1e26d0cff45f3d1104144e0f642 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Oct 2017 18:27:54 +0200
Subject: [PATCH 42/52] Creating a page from an external url can grab images
 too.

---
 htdocs/core/lib/geturl.lib.php | 32 +++++++++++++++++------
 htdocs/websites/index.php      | 47 +++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 6f268fda3a7..cb594259c9f 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -55,7 +55,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
-	
+
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
@@ -63,7 +63,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
 	// You can force, if supported a version like TLSv1 or TLSv1.2
 	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
-	
+
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
@@ -82,12 +82,12 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	if (! is_array($param)) parse_str($param, $array_param);
-    	else 
+    	else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param=$param;
     	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields	
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
@@ -121,7 +121,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     $response = curl_exec($ch);
 
     $request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
-    
+
     dol_syslog("getURLContent request=".$request);
     dol_syslog("getURLContent response=".$response);
 
@@ -130,7 +130,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     {
         // Ad keys to $rep
         $rep['content']=$response;
-        
+
         // moving to display page to display curl errors
 		$rep['curl_error_no']=curl_errno($ch);
         $rep['curl_error_msg']=curl_error($ch);
@@ -146,12 +146,12 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     	//$rep['header_size']=$info['header_size'];
     	//$rep['http_code']=$info['http_code'];
     	dol_syslog("getURLContent http_code=".$rep['http_code']);
-    	
+
         // Add more keys to $rep
         $rep['content']=$response;
     	$rep['curl_error_no']='';
     	$rep['curl_error_msg']='';
-    	 
+
     	//closing the curl
         curl_close($ch);
     }
@@ -159,3 +159,19 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     return $rep;
 }
 
+
+/**
+ * Function get second level domain name.
+ * For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
+ *
+ * @param	string	  $url 				    Full URL.
+ * @return	string						    Returns domaine name
+ */
+function getDomainFromURL($url)
+{
+	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
+	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
+	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+	return $tmpdomain;
+}
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 96947035113..39d41307f20 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -94,6 +94,7 @@ $pageid=GETPOST('pageid', 'int');
 $pageref=GETPOST('pageref', 'aZ09');
 $action=GETPOST('action','alpha');
 
+
 if (GETPOST('delete')) { $action='delete'; }
 if (GETPOST('preview')) $action='preview';
 if (GETPOST('createsite')) { $action='createsite'; }
@@ -246,7 +247,11 @@ if ($action == 'add')
 
     		$urltograbwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\/?/i', '', $urltograbwithoutdomain);
    			$objectpage->pageurl = basename($urltograbwithoutdomain);
-   			if (empty($objectpage->pageurl)) $objectpage->pageurl='home';
+   			if (empty($objectpage->pageurl))
+   			{
+   				$tmpdomain = getDomainFromURL($urltograb);
+   				$objectpage->pageurl='home'.$tmpdomain;
+   			}
 
     		if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
     		{
@@ -270,6 +275,46 @@ if ($action == 'add')
     		$objectpage->content = preg_replace('/^.*<body[^>]*>/ims', '', $objectpage->content);
     		$objectpage->content = preg_replace('/<\/body[^>]*>.*$/ims', '', $objectpage->content);
 
+    		$tmp = $objectpage->content;
+
+    		// Now loop o to fetch all images
+    		preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $objectpage->content, $regs);
+			foreach ($regs[0] as $key => $val)
+			{
+				$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+				$linkwithoutdomain = $regs[2][$key];
+				$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+				if (preg_match('/^http/', $regs[2][$key]))
+				{
+					$urltograbbis = $regs[2][$key];
+					$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
+					$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+				}
+
+				$tmpgeturl = getURLContent($urltograbbis);
+				if ($tmpgeturl['curl_error_no'])
+				{
+					$error++;
+					setEventMessages($tmpgeturl['curl_error_msg'], null, 'errors');
+					$action='create';
+				}
+				else
+				{
+					dol_mkdir(dirname($filetosave));
+
+					$fp = fopen($filetosave, "w");
+					fputs($fp, $tmpgeturl['content']);
+					fclose($fp);
+					if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
+
+				$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+				$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '<img'.$regs[1][$key].'src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'"'.$regs[3][$key].'>', $tmp);
+			}
+//print dol_escape_htmltag($tmp);exit;
+			$objectpage->content = $tmp;
+
     		$objectpage->grabbed_from = $urltograb;
     	}
     }

From 5df0f4c2fdbfaafbf029521708da2f0842d1e4b1 Mon Sep 17 00:00:00 2001
From: AXeL-dev <anass_denna@hotmail.fr>
Date: Sun, 1 Oct 2017 18:33:22 +0100
Subject: [PATCH 43/52] FIX: in payment form, label does not fill with GET
 method

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

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 2b8b6a6fe5b..bf9e62e157f 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -253,7 +253,7 @@ if ($action == 'create')
 	// Label
 	print '<tr><td>';
 	print fieldLabel('Label','label',1).'</td><td>';
-	print '<input name="label" id="label" class="minwidth300" value="'.($_POST["label"]?GETPOST("label",'',2):$langs->trans("SalaryPayment")).'">';
+	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label")?GETPOST("label"):$langs->trans("SalaryPayment")).'">';
 	print '</td></tr>';
 
 	// Date start period

From f7dcf1ca45430d4083f4c68fdbcc2baba8f49876 Mon Sep 17 00:00:00 2001
From: AXeL-dev <anass_denna@hotmail.fr>
Date: Sun, 1 Oct 2017 18:35:06 +0100
Subject: [PATCH 44/52] FIX: wrong user first name/last name position in user
 tooltip

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 40124109961..21815185cb5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2058,7 +2058,7 @@ class User extends CommonObject
 
 		$label.= '<div class="centpercent">';
 		$label.= '<u>' . $langs->trans("User") . '</u><br>';
-		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
+		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'');
 		if (! empty($this->login))
 			$label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
 		$label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;

From 46800afac97f83cbf03300d3052ee633fc1c14e7 Mon Sep 17 00:00:00 2001
From: AXeL-dev <anass_denna@hotmail.fr>
Date: Sun, 1 Oct 2017 18:38:08 +0100
Subject: [PATCH 45/52] FIX: missing variables in payment form

---
 htdocs/compta/salaries/card.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index bf9e62e157f..47d4c027185 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -214,6 +214,12 @@ if ($action == 'create')
 		$pastmonthyear--;
 	}
 
+	$datespmonth = GETPOST('datespmonth', 'int');
+	$datespday = GETPOST('datespday', 'int');
+	$datespyear = GETPOST('datespyear', 'int');
+	$dateepmonth = GETPOST('dateepmonth', 'int');
+	$dateepday = GETPOST('dateepday', 'int');
+	$dateepyear = GETPOST('dateepyear', 'int');
 	$datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
 	$dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
 

From 8180967652280de22c1bc859d22fecaea3e4416c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Oct 2017 20:37:41 +0200
Subject: [PATCH 46/52] Enhance fetch of external page for module website

---
 htdocs/websites/index.php | 185 +++++++++++++++++++++++++++++++++++---
 1 file changed, 172 insertions(+), 13 deletions(-)

diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 39d41307f20..ac3686528b5 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -312,7 +312,8 @@ if ($action == 'add')
 				$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
 				$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '<img'.$regs[1][$key].'src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'"'.$regs[3][$key].'>', $tmp);
 			}
-//print dol_escape_htmltag($tmp);exit;
+
+			//print dol_escape_htmltag($tmp);exit;
 			$objectpage->content = $tmp;
 
     		$objectpage->grabbed_from = $urltograb;
@@ -357,6 +358,33 @@ if ($action == 'add')
             $error++;
             setEventMessages($objectpage->error, $objectpage->errors, 'errors');
         }
+    }
+    if (! $error)
+    {
+    	if (! empty($objectpage->content))
+    	{
+			$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+			$filetpl=$pathofwebsite.'/page'.$objectpage->id.'.tpl.php';
+
+    		// Save page alias
+    		$result=dolSavePageAlias($filealias, $object, $objectpage);
+    		if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+
+    		// Save page of content
+    		$result=dolSavePageContent($filetpl, $object, $objectpage);
+    		if ($result)
+    		{
+    			setEventMessages($langs->trans("Saved"), null, 'mesgs');
+    			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+    			//exit;
+    		}
+    		else
+    		{
+    			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
+    			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+    			//exit;
+    		}
+    	}
     }
 	if (! $error)
 	{
@@ -371,8 +399,35 @@ if ($action == 'add')
 
 	if (! $error)
 	{
-	   $action = 'preview';
 	   $pageid = $objectpage->id;
+
+	   // To generate the CSS, robot and htmlheader file.
+
+		if (! dol_is_file($filehtmlheader))
+		{
+			$htmlheadercontent = "<!-- HTML header content (common for all pages) -->";
+			$result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+		}
+
+		if (! dol_is_file($filecss))
+		{
+			$csscontent = "/* CSS content (all pages) */\nbody.bodywebsite { margin: 0; }'";
+			$result=dolSaveCssFile($filecss, $csscontent);
+		}
+
+		if (! dol_is_file($filerobot))
+		{
+			$robotcontent = "# Robot file. Generated with Dolibarr\nUser-agent: *\nAllow: /public/\nDisallow: /administrator/";
+			$result=dolSaveRobotFile($filerobot, $robotcontent);
+		}
+
+		if (! dol_is_file($filehtaccess))
+		{
+			$htaccesscontent = "# Order allow,deny\n# Deny from all";
+			$result=dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+		}
+
+		$action = 'preview';
 	}
 }
 
@@ -445,18 +500,8 @@ if ($action == 'updatecss')
 
 	    $htmlheadercontent = trim($htmlheadercontent)."\n";
 
-	    dol_syslog("Save html header into ".$filehtmlheader);
+	    dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
 
-	    dol_mkdir($pathofwebsite);
-	    $result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	    if (! empty($conf->global->MAIN_UMASK))
-	        @chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
-
-	    if (! $result)
-	    {
-	        $error++;
-	        setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-	    }
 
 	    // Css file
 	    $csscontent ='';
@@ -1782,3 +1827,117 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 
 	return $result;
 }
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filetpl			Full path of filename to generate
+ * @param	string		$htmlheadercontent	Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save html header into ".$filehtmlheader);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+
+	if (! $result)
+	{
+		$error++;
+		setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filecss			Full path of filename to generate
+ * @param	string		$csscontent			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveCssFile($filecss, $csscontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save html header into ".$filecss);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filecss, $csscontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			$error++;
+			setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filerobot			Full path of filename to generate
+ * @param	string		$robotcontent		Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveRobotFile($filerobot, $robotcontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save html header into ".$filerobot);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filerobot, $robotcontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+
+	if (! $result)
+	{
+		$error++;
+		setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filehtaccess		Full path of filename to generate
+ * @param	string		$htaccess			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveHtaccessFile($filehtaccess, $htaccess)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save html header into ".$filehtaccess);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filehtaccess, $htaccess);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+
+	if (! $result)
+	{
+		$error++;
+		setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+		return false;
+	}
+
+	return true;
+}
+

From e13f29b4c8a53c20f201a242523c1707bb7a150e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Oct 2017 21:29:49 +0200
Subject: [PATCH 47/52] Add ID of page

---
 htdocs/langs/en_US/website.lang |  1 +
 htdocs/websites/index.php       | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index e42504f4706..b1ac20d2e7f 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -49,3 +49,4 @@ CreateByFetchingExternalPage=Create page/container by fetching page from externa
 OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
+IDOfPage=Id of page
\ No newline at end of file
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index ac3686528b5..95ef8f37948 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -275,9 +275,14 @@ if ($action == 'add')
     		$objectpage->content = preg_replace('/^.*<body[^>]*>/ims', '', $objectpage->content);
     		$objectpage->content = preg_replace('/<\/body[^>]*>.*$/ims', '', $objectpage->content);
 
+
+    		// Now loop to fetch all css files. Include them inline into header of page
+			// TODO...
+
+
     		$tmp = $objectpage->content;
 
-    		// Now loop o to fetch all images
+    		// Now loop to fetch all images
     		preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $objectpage->content, $regs);
 			foreach ($regs[0] as $key => $val)
 			{
@@ -399,12 +404,13 @@ if ($action == 'add')
 
 	if (! $error)
 	{
-	   $pageid = $objectpage->id;
+		$pageid = $objectpage->id;
 
-	   // To generate the CSS, robot and htmlheader file.
+		// To generate the CSS, robot and htmlheader file.
 
 		if (! dol_is_file($filehtmlheader))
 		{
+			// TODO use header of page for common header ?
 			$htmlheadercontent = "<!-- HTML header content (common for all pages) -->";
 			$result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
 		}
@@ -1536,6 +1542,12 @@ if ($action == 'editmeta' || $action == 'create')
 
     if ($action != 'create')
     {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('IDOfPage');
+        print '</td><td>';
+        print $pageid;
+        print '</td></tr>';
+
         print '<tr><td class="titlefield">';
         print $langs->trans('WEBSITE_PAGEURL');
         print '</td><td>';

From 94ae6c62e670e52997416a50ee00d3313619376c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Oct 2017 00:08:00 +0200
Subject: [PATCH 48/52] Add htmlheader field for each page

---
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql   |  1 +
 htdocs/install/mysql/tables/llx_website_page.sql |  1 +
 htdocs/langs/en_US/website.lang                  |  2 +-
 htdocs/websites/class/websitepage.class.php      | 11 +++++++++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index a34b5e8cab6..f3f0f143ec8 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -103,6 +103,7 @@ ALTER TABLE llx_website_page MODIFY COLUMN pageurl varchar(255);
 ALTER TABLE llx_website_page ADD COLUMN lang varchar(6);
 ALTER TABLE llx_website_page ADD COLUMN fk_page integer;
 ALTER TABLE llx_website_page ADD COLUMN grabbed_from varchar(255);
+ALTER TABLE llx_website_page ADD COLUMN htmlheader text;
 
 ALTER TABLE llx_website_page MODIFY COLUMN status INTEGER DEFAULT 1;
 UPDATE llx_website_page set status = 1 WHERE status IS NULL;
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page.sql
index f3d1cca4786..5393177a3bb 100644
--- a/htdocs/install/mysql/tables/llx_website_page.sql
+++ b/htdocs/install/mysql/tables/llx_website_page.sql
@@ -27,6 +27,7 @@ CREATE TABLE llx_website_page
 	keywords      varchar(255),
 	lang          varchar(6),
 	fk_page       integer,          
+	htmlheader	  text,
 	content		  mediumtext,		-- text is not enough in size
     status        integer DEFAULT 1,
 	grabbed_from   varchar(255),
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index b1ac20d2e7f..514b76af16c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -37,7 +37,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. 
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax: <strong>&lt;?php dolIncludeHtmlContent($websitekey.'/contentaliastoinclude.php'); ?&gt;</strong><br><br>To include a link to download a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=reldir/filename.ext"&gt;</strong>.<br>for a file into documents/media (open public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias[&hashp=publicsharekey if modulepart != medias]"&gt;</strong>.<br><br>To include an image stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=filename.ext"&gt;</strong>.
+YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
 ClonePage=Clone page/container
 CloneSite=Clone site
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index 756d927aed9..ae10398795c 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -52,6 +52,7 @@ class WebsitePage extends CommonObject
 	public $title;
 	public $description;
 	public $keywords;
+	public $htmlheader;
 	public $content;
 	public $status;
 	public $date_creation;
@@ -67,11 +68,12 @@ class WebsitePage extends CommonObject
 	    'title'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1),
 	    'description'   =>array('type'=>'varchar(255)', 'label'=>'Description',      'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1),
 	    'keywords'      =>array('type'=>'varchar(255)', 'label'=>'Keywords',         'enabled'=>1, 'visible'=>1,  'position'=>45,  'searchall'=>0),
-	    'content'       =>array('type'=>'mediumtext',   'label'=>'Content',          'enabled'=>1, 'visible'=>1,  'position'=>45,  'searchall'=>0),
-	    'lang'          =>array('type'=>'varchar(6)',   'label'=>'Lang',             'enabled'=>1, 'visible'=>1,  'position'=>45,  'searchall'=>0),
+		'lang'          =>array('type'=>'varchar(6)',   'label'=>'Lang',             'enabled'=>1, 'visible'=>1,  'position'=>45,  'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 	    'fk_website'    =>array('type'=>'integer',      'label'=>'WebsiteId',        'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'position'=>40,  'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
 	    'fk_page'       =>array('type'=>'integer',      'label'=>'ParentPageId',     'enabled'=>1, 'visible'=>1,  'notnull'=>-1, 'position'=>45,  'searchall'=>0, 'foreignkey'=>'website.rowid'),
+	    'htmlheader'    =>array('type'=>'text',         'label'=>'HtmlHeader',       'enabled'=>1, 'visible'=>0,  'position'=>50,  'searchall'=>0),
+	    'content'       =>array('type'=>'mediumtext',   'label'=>'Content',          'enabled'=>1, 'visible'=>0,  'position'=>51,  'searchall'=>0),
 		'grabbed_from'  =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom',      'enabled'=>1, 'visible'=>1,  'index'=>1,   'position'=>400, 'comment'=>'URL page content was grabbed from'),
 	    'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
@@ -126,6 +128,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.title,";
 		$sql .= " t.description,";
 		$sql .= " t.keywords,";
+		$sql .= " t.htmlheader,";
 		$sql .= " t.content,";
 		$sql .= " t.lang,";
 		$sql .= " t.fk_page,";
@@ -162,6 +165,7 @@ class WebsitePage extends CommonObject
 				$this->title = $obj->title;
 				$this->description = $obj->description;
 				$this->keywords = $obj->keywords;
+				$this->htmlheader = $obj->htmlheader;
 				$this->content = $obj->content;
 				$this->lang = $obj->lang;
 				$this->fk_page = $obj->fk_page;
@@ -210,6 +214,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.title,";
 		$sql .= " t.description,";
 		$sql .= " t.keywords,";
+		$sql .= " t.htmlheader,";
 		$sql .= " t.content,";
 		$sql .= " t.lang,";
 		$sql .= " t.fk_page,";
@@ -255,6 +260,7 @@ class WebsitePage extends CommonObject
 				$record->title = $obj->title;
 				$record->description = $obj->description;
 				$record->keywords = $obj->keywords;
+				$record->htmlheader = $obj->htmlheader;
 				$record->content = $obj->content;
 				$record->lang = $obj->lang;
 				$record->fk_page = $obj->fk_page;
@@ -469,6 +475,7 @@ class WebsitePage extends CommonObject
 		$this->title = 'My Page';
 		$this->description = 'This is my page';
 		$this->keywords = 'keyword1, keyword2';
+		$this->htmlheader = '';
 		$this->content = '<html><body>This is a html content</body></html>';
 		$this->status = '';
 		$this->grabbed_from = '';

From f15ce54c05e79667d513f5aaccf0fb60ed45b92c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Oct 2017 00:34:55 +0200
Subject: [PATCH 49/52] Update commondocgenerator.class.php

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 91da8072922..6ac96190245 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -419,7 +419,7 @@ abstract class CommonDocGenerator
 		}
 
 		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && $object->fk_project > 0)
+		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
 		{
 			if(!isset($object->project))
 			{

From 48c3d0e3f2fe6ce61be1073fa754c8aa71ff7302 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Oct 2017 00:36:15 +0200
Subject: [PATCH 50/52] Update commondocgenerator.class.php

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 6ac96190245..937634de5d4 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -421,7 +421,7 @@ abstract class CommonDocGenerator
 		// Fetch project information if there is a project assigned to this object
 		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
 		{
-			if(!isset($object->project))
+			if (! is_object($object->project))
 			{
 				$object->fetch_projet();
 			}

From 989f285d32a03c7f43dccaa0cf6b7654ee533fe6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Oct 2017 01:23:07 +0200
Subject: [PATCH 51/52] Replace table with div

---
 htdocs/admin/delais.php | 217 ++++++++++++++++------------------------
 1 file changed, 86 insertions(+), 131 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 0d9e80f5326..37f66427225 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -136,10 +136,10 @@ if ($action == 'update')
     		}
     	}
 	}
-	
+
 	dolibarr_set_const($db, "MAIN_DISABLE_METEO",$_POST["MAIN_DISABLE_METEO"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE",GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"),'chaine',0,'',$conf->entity);
-    
+
 	// For update value with percentage
 	$plus='';
 	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
@@ -147,7 +147,7 @@ if ($action == 'update')
 	for($i=0;$i<4;$i++) {
     	if(isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'),'chaine',0,'',$conf->entity);
     }
-    
+
 }
 
 
@@ -249,26 +249,26 @@ else
 
 }
 
-print '<br />';
+print '<br>';
 
 // Show logo for weather
 print $langs->trans("DescWeather").'<br>';
 
 if($action == 'edit') {
-	
+
 	$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoPercentageMod'));
 	$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoStdMod'));
 	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
 	else $str_mode_enabled = $str_mode_percentage;
 	print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
 	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
-	
-	print '<br /><br />';
-	
+
+	print '<br><br>';
+
 } else {
 	if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
 	else print $langs->trans('MeteoPercentageModEnabled');
-	print '<br /><br />';
+	print '<br><br>';
 }
 
 $offset=0;
@@ -279,88 +279,63 @@ $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level
 $level1=$offset+1*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
 $level2=$offset+2*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;
 $level3=$offset+3*$cursor; if (! empty($conf->global->MAIN_METEO_LEVEL3)) $level3=$conf->global->MAIN_METEO_LEVEL3;
-$text=''; $options='height="60px"';
-	
+$text=''; $options='class="valignmiddle" height="60px"';
+
+
+if ($action == 'edit') {
+
 
-if($action == 'edit') {
-	
-	
 	print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
-	
-	print '<table>';
-	print '<tr>';
-	print '<td>';
-	print img_weather($text,'weather-clear.png',$options);
-	print '</td><td>= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td>';
+
+	print '<div>';
+	print '<div class="inline-block" style="padding-right: 20px">';
+	print img_weather($text,'weather-clear.png', $options);
+	print '= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-few-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td>';
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
-	print '</tr>';
-	
-	print '<tr><td>';
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-many-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	/*print '<td>';
-	 print img_weather($text,'weather-storm.png',$options);
-	 print '</td><td>&gt; '.$level3.'</td>';*/
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '</tr>';
-	
-	print '</table>';
-	
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
 	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
 	print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
-	
-	print '<table>';
-	print '<tr>';
-	print '<td>';
+
+	print '<div>';
+	print '<div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-clear.png',$options);
-	print '</td><td>= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td>';
+	print '= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-few-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td>';
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
-	print '</tr>';
-	
-	print '<tr><td>';
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+	print '</div><div class="inline-block" style="padding-right: 20px">';
 	print img_weather($text,'weather-many-clouds.png',$options);
-	print '</td><td>&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	/*print '<td>';
-	 print img_weather($text,'weather-storm.png',$options);
-	 print '</td><td>&gt; '.$level3.'</td>';*/
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-	print '</tr>';
-	
-	print '</table>';
-	
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
 	print '</div>';
-	
+	print '</div>';
+
+	print '</div>';
+
 	?>
 
 	<script type="text/javascript">
-	
+
 		$(document).ready(function() {
-	
+
 			$("#change_mode").click(function() {
 				var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
 				var str_mode_std = "<?php print $str_mode_std; ?>";
 				var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
-	
+
 				if(use_percent.val() == 1) {
 					use_percent.val(0);
 					$("#standard").show();
@@ -373,93 +348,73 @@ if($action == 'edit') {
 					$(this).html(str_mode_percentage);
 				}
 			});
-	
+
 		});
-	
+
 	</script>
-	
+
 	<?php
-	
+
 } else {
-	
+
 	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-	
-		print '<table>';
-		print '<tr>';
-		print '<td>';
+
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-clear.png',$options);
-		print '</td><td>= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-few-clouds.png',$options);
-		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-clouds.png',$options);
-		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
-		print '</tr>';
-		
-		print '<tr><td>';
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-many-clouds.png',$options);
-		print '</td><td>&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-storm.png',$options);
-		print '</td><td>&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '</tr>';
-		
-		print '</table>';
-		
+		print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+		print '</div>';
+		print '</div>';
+
 	} else {
-		
-		print '<table>';
-		print '<tr>';
-		print '<td>';
+
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-clear.png',$options);
-		print '</td><td>= '.$level0.'</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '= '.$level0;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-few-clouds.png',$options);
-		print '</td><td>&lt;= '.$level1.'</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '&lt;= '.$level1;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-clouds.png',$options);
-		print '</td><td>&lt;= '.$level2.'</td>';
-		print '</tr>';
-		
-		print '<tr><td>';
+		print '&lt;= '.$level2;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-many-clouds.png',$options);
-		print '</td><td>&lt;= '.$level3.'</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td>';
+		print '&lt;= '.$level3;
+		print '</div><div class="inline-block" style="padding-right: 20px">';
 		print img_weather($text,'weather-storm.png',$options);
-		print '</td><td>&gt; '.$level3.'</td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '<td> &nbsp; &nbsp; &nbsp; &nbsp; </td>';
-		print '</tr>';
-		
-		print '</table>';
-		
+		print '&gt; '.$level3;
+		print '</div>';
+		print '</div>';
+
 	}
 }
 
 print '</div>';
-	
+
 if($action == 'edit') {
-	
+
 	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 	print '<br></form>';
-	
+
 } else {
-	
+
 	// Boutons d'action
 	print '<br><div class="tabsAction">';
 	print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
-	
+
 }
 
 llxFooter();

From 8f969d61e2845786badcffd5e5e6447f8575e7cd Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 2 Oct 2017 09:23:04 +0200
Subject: [PATCH 52/52] FIX : invalid foreach protection

---
 htdocs/user/class/user.class.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 4382ace94ff..77ccbbcb219 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -399,12 +399,14 @@ class User extends CommonObject
 			        }
 			    }
 			    // Sort by key, so _noquery_ is last
-			    foreach($this->default_values as $a => $b)
-			    {
-			    	foreach($b as $c => $d)
-			    	{
-			    		krsort($this->default_values[$a][$c]);
-			    	}
+			    if(!empty($this->default_values)) {
+				    foreach($this->default_values as $a => $b)
+				    {
+				    	foreach($b as $c => $d)
+				    	{
+				    		krsort($this->default_values[$a][$c]);
+				    	}
+				    }
 			    }
 			    $this->db->free($resql);
 			}