Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php

htdocs/admin/stock.php

@@ -139,6 +139,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->facture->enabled))
 {
 	$var=!$var;
@@ -151,6 +153,7 @@ if (! empty($conf->facture->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->commande->enabled))
@@ -165,6 +168,7 @@ if (! empty($conf->commande->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->expedition->enabled))
@@ -179,7 +183,17 @@ if (! empty($conf->expedition->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockDecrease").'</td>';
+	print "</tr>\n";
+}
+
 print '</table>';
 
 print '<br>';
@@ -192,6 +206,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->fournisseur->enabled))
 {
 	$var=!$var;
@@ -204,6 +220,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->fournisseur->enabled))
@@ -218,6 +235,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 if (! empty($conf->fournisseur->enabled))
 {
@@ -231,11 +249,22 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
+}
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockIncrease").'</td>';
+	print "</tr>\n";
 }
 
 print '</table>';
 
 // Optio to force stock to be enough before adding a line into document
+if ($conf->invoice->enabled || $conf->order->enabled || $conf->expedition->enabled)
+{
 	print '<br>';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -288,7 +317,7 @@ if($conf->expedition->enabled) {
 		print "</tr>\n";
 	}
 	print '</table>';
-
+}
 
 $virtualdiffersfromphysical=0;
 if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)

htdocs/install/mysql/migration/3.6.0-3.7.0.sql

@@ -1095,6 +1095,9 @@ ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
 
+ALTER TABLE llx_projet_task CHANGE COLUMN duration_effective real DEFAULT 0 NULL;
+ALTER TABLE llx_projet_task CHANGE COLUMN planned_workload real DEFAULT 0 NULL;
+  
 
 -- add extrafield on ficheinter lines
 CREATE TABLE llx_fichinterdet_extrafields

htdocs/install/mysql/tables/llx_projet_task.sql

@@ -31,8 +31,8 @@ create table llx_projet_task
   datev					datetime,						-- date validation
   label					varchar(255) NOT NULL,
   description			text,
-  duration_effective	real DEFAULT 0 NOT NULL,
+  duration_effective	real DEFAULT 0,
-  planned_workload		real DEFAULT 0 NOT NULL,
+  planned_workload		real DEFAULT 0,
   progress				integer DEFAULT 0,				-- percentage increase
   priority				integer DEFAULT 0,				-- priority
   fk_user_creat			integer,						-- user who created the task

htdocs/langs/en_US/admin.lang

@@ -1590,3 +1590,5 @@ TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both custome
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
+NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
+NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.

htdocs/projet/index.php

@@ -25,6 +25,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
@@ -50,6 +51,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $socstatic=new Societe($db);
 $projectstatic=new Project($db);
 $userstatic=new User($db);
+$tasktmp=new Task($db);
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:(empty($user->rights->projet->all->lire)?0:2)),1);
 //var_dump($projectsListId);
@@ -227,7 +229,9 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			print '<td>';
 			if (! empty($obj->taskid))
 			{
-				print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a>';
+				$tasktmp->id = $obj->taskid;
+				$tasktmp->ref = $obj->label;
+				print $tasktmp->getNomUrl(1,'withproject');
 			}
 			else print $langs->trans("NoTasks");
 			print '</td>';