Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

Build Badge by branch

.travis.yml

@@ -2,6 +2,7 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
+dist: precise
 sudo: required
 
 language: php
@@ -130,10 +131,10 @@ before_script:
   echo "Set timezone"
   echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
   if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-    echo
+    #echo
-    echo "Enabling APC for PHP <= 5.4"
+    #echo "Enabling APC for PHP <= 5.4"
     #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
-    echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
     echo
     echo "Enabling Memcached for PHP <= 5.4"
     #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0 and nightly!

README.md

@@ -1,6 +1,6 @@
 # DOLIBARR ERP & CRM
 
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/4.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 

build/makepack-dolibarr.pl

@@ -19,7 +19,7 @@ use Cwd;
 # Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
 $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@vmprod.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
 #@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages

htdocs/comm/action/class/actioncomm.class.php

@@ -2,8 +2,8 @@
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011-2017 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015	   Marcos García		<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1255,6 +1255,7 @@ class ActionComm extends CommonObject
             {
                 // Note: Output of sql request is encoded in $conf->file->character_set_client
                 // This assignment in condition is not a bug. It allows walking the results.
+				$diff = 0;
                 while ($obj=$this->db->fetch_object($resql))
                 {
                     $qualified=true;
@@ -1289,8 +1290,9 @@ class ActionComm extends CommonObject
 
                     if ($qualified && $datestart)
                     {
-                        $eventarray[$datestart]=$event;
+                        $eventarray[$datestart+$diff]=$event;
                     }
+                    $diff++;
                 }
             }
             else

htdocs/compta/facture.php

@@ -1153,7 +1153,9 @@ if (empty($reshook))
 
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals($lines[$i]->rowid);
+											$targetExtraFields = new ExtraFields($db);
+											$targetExtraFieldLabels = $targetExtraFields->fetch_name_optionals_label($object->table_element_line);
+											$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraFieldLabels);
 											$array_options = $lines[$i]->array_options;
 										}
 

htdocs/compta/facture/document.php

@@ -4,6 +4,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2017      Frédéric France       <frederic.france@netlogic.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
@@ -161,6 +162,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-$db->close();
-
 llxFooter();
+
+$db->close();

htdocs/compta/facture/fiche-rec.php

@@ -896,7 +896,7 @@ if ($action == 'create')
     		$langs->load('projects');
     		print '<tr><td>' . $langs->trans('Project') . '</td><td>';
     		$numprojet = $formproject->select_projects($socid, $projectid, 'projectid', 0);
-    		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+    		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $object->thirdparty->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$object->thirdparty->id).'">' . $langs->trans("AddProject") . '</a>';
     		print '</td></tr>';
     	}
 
@@ -963,7 +963,7 @@ if ($action == 'create')
 		    $disableedit=1;
 		    $disablemove=1;
 		    $disableremove=1;
-		    $ret = $object->printObjectLines('', $mysoc, $soc, $lineid, 0);      // No date selector for template invoice
+		    $ret = $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
 		}
 
 		print "</table>\n";
@@ -1307,7 +1307,7 @@ else
 		{
 		    //$disableedit=1;
 		    //$disablemove=1;
-		    $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 0);      // No date selector for template invoice
+		    $ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
 		}
 
 		// Form to add new line
@@ -1318,7 +1318,7 @@ else
     		    $var = true;
 
     		    // Add free products/services
-    		    $object->formAddObjectLine(0, $mysoc, $soc);                          // No date selector for template invoice
+    		    $object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
 
     		    $parameters = array();
     		    $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

htdocs/core/class/commonobject.class.php

@@ -4156,6 +4156,13 @@ abstract class CommonObject
             foreach($this->array_options as $key => $value)
             {
                	$attributeKey = substr($key,8);   // Remove 'options_' prefix
+
+				// array_option may contain extrafields from an origin object that doesn't exist in current object, we should not try to insert them
+				if(empty($extrafields->attribute_type[$attributeKey])) {
+					unset($this->array_options[$key]);
+					continue;
+				}
+				
                	$attributeType  = $extrafields->attribute_type[$attributeKey];
                	$attributeLabel = $extrafields->attribute_label[$attributeKey];
                	$attributeParam = $extrafields->attribute_param[$attributeKey];

htdocs/core/lib/project.lib.php

@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 function project_prepare_head($object)
 {
 	global $db, $langs, $conf, $user;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -114,7 +114,7 @@ function project_prepare_head($object)
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
-	
+
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
 
 	return $head;
@@ -487,7 +487,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
     				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
     				$level--;
 				}
-				
+
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
@@ -551,9 +551,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	$numlines=count($lines);
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -561,10 +561,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	    {
 	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
 	    }
-	}	
+	}
 
     //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	
+
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
 		if ($parent == 0) $level = 0;
@@ -575,7 +575,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
                 //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-                
+
 				// Break on a new project
         		if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
         		{
@@ -585,7 +585,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
         				$projectstatic->id = $lines[$i]->fk_project;
         			}
         		}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
     				if ($preselectedday)
@@ -594,7 +594,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	       		        $workloadforid[$projectstatic->id]=1;
     				}
 			    }
-			     
+
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
 				$projectstatic->title=$lines[$i]->projectlabel;
@@ -702,16 +702,16 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '<textarea name="'.$lines[$i]->id.'note" rows="2" id="note">';
 				print '</textarea>';
 				print '</td>';
-				
+
 				print "</tr>\n";
 			}
 
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
-			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var); 
+			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
 			}
 			$level--;
 		}
@@ -752,7 +752,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -763,18 +763,18 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	}
 
     //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	
+
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
 		if ($parent == 0) $level = 0;
-		
+
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
 			    //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-			    
+
 			    // Break on a new project
     			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
     			{
@@ -782,13 +782,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
     				$lastprojectid=$lines[$i]->fk_project;
     				$projectstatic->id = $lines[$i]->fk_project;
     			}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
 				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
                     $workloadforid[$projectstatic->id]=1;
 			    }
-			    
+
 				print "<tr ".$bc[$var].">\n";
 
 				// Project
@@ -868,7 +868,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
-				
+
 				// Fields to show current time
 				$tableCell=''; $modeinput='hours';
 				for ($idw = 0; $idw < 7; $idw++)
@@ -879,7 +879,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 		        	$alreadyspent='';
 		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
                     $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
-		        	
+
                     $tableCell ='<td align="center" class="hide'.$idw.'">';
                     if ($alreadyspent)
                     {
@@ -895,7 +895,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
                     print $tableCell;
 		        }
 		        dol_syslog("yyy");
-		        
+
 				print '<td align="right">';
 				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
 				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
@@ -907,7 +907,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			// Call to show task with a lower level (task under the current task)
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
 			    else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
@@ -981,7 +981,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 
 	$projectstatic=new Project($db);
     $thirdpartystatic=new Societe($db);
-    
+
 	$sortfield='';
 	$sortorder='';
 	$project_year_filter=0;
@@ -990,7 +990,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
 	$arrayidtypeofcontact=array();
-	
+
 	print '<table class="noborder" width="100%">';
 
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
@@ -1033,11 +1033,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
 		}
 	}
-	
+
 	// Get id of project we must show tasks
 	$arrayidofprojects=array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql; 
+	$sql1.= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
@@ -1052,7 +1052,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	}
 	else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
-	
+
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
 	$sql2.= " p.dateo, p.datee,";
@@ -1083,7 +1083,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     		print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder);
     		print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder);
     	}
-    	if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+    	if (empty($conf->global->PROJECT_HIDE_TASKS))
     	{
             print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
             if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre($langs->trans("PlannedWorkload"),"","","","",'align="right"',$sortfield,$sortorder);
@@ -1091,7 +1091,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     	}
     	print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
     	print "</tr>\n";
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -1109,7 +1109,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			    $projectstatic->title = $objp->title;
 			    $projectstatic->datee = $db->jdate($objp->datee);
 			    $projectstatic->dateo = $db->jdate($objp->dateo);
-			     
+
 				$var=!$var;
 				print "<tr ".$bc[$var].">";
 				print '<td>';
@@ -1135,17 +1135,17 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         			if ($code) print $langs->trans("OppStatus".$code);
 					print '</td>';
 				}
-				if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 				    print '<td align="right">'.$objp->nb.'</td>';
-    	       
+
     				$plannedworkload=$objp->planned_workload;
     				$total_plannedworkload+=$plannedworkload;
     				if (! in_array('plannedworkload', $hiddenfields))
     				{
     				    print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
     				}
-    				if (! in_array('declaredprogress', $hiddenfields)) 
+    				if (! in_array('declaredprogress', $hiddenfields))
     				{
     				    $declaredprogressworkload=$objp->declared_progess_workload;
         				$total_declaredprogressworkload+=$declaredprogressworkload;
@@ -1155,7 +1155,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         				print '</td>';
     				}
 				}
-				
+
 				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
 				print "</tr>\n";
 
@@ -1174,7 +1174,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
             print '<td class="liste_total" align="right">'.$total_task.'</td>';
             if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
@@ -1182,7 +1182,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 		}
 		print '<td class="liste_total"></td>';
         print '</tr>';
-        
+
 		$db->free($resql);
 	}
 	else

htdocs/core/modules/modCommande.class.php

@@ -72,7 +72,7 @@ class modCommande extends DolibarrModules
 		$this->depends = array("modSociete");
 		$this->requiredby = array("modExpedition");
 		$this->conflictwith = array();
-		$this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries');
+		$this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries', 'sendings');
 
 		// Constants
 		$this->const = array();
@@ -178,9 +178,9 @@ class modCommande extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='CustomersOrdersAndOrdersLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("commande","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','pj.ref'=>'ProjectRef','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.date_livraison'=>"DateDeliveryPlanned",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','pj.ref'=>'ProjectRef','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','pj.ref'=>'Text','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text','d.nom'=>'Text');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.date_livraison'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','pj.ref'=>'Text','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text','d.nom'=>'Text');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'pj.ref'=>'project','cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect='commande'; $keyforelement='order'; $keyforaliasextra='extra';

htdocs/core/modules/modFournisseur.class.php

@@ -73,7 +73,7 @@ class modFournisseur extends DolibarrModules
 		// Dependencies
 		$this->depends = array("modSociete");
 		$this->requiredby = array();
-		$this->langfiles = array('bills', 'companies', 'suppliers', 'orders');
+		$this->langfiles = array('bills', 'companies', 'suppliers', 'orders', 'sendings');
 
 		// Config pages
 		$this->config_page_url = array("supplier_order.php");
@@ -443,14 +443,14 @@ class modFournisseur extends DolibarrModules
 		$this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
 		$this->export_icon[$r]='order';
 		$this->export_permission[$r]=array(array("fournisseur","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.date_approve'=>'DateApprove','f.date_approve2'=>'DateApprove2','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'ua1.login'=>'ApprovedBy','ua2.login'=>'ApprovedBy2','fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId',
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.date_livraison'=>"DateDeliveryPlanned",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.date_approve'=>'DateApprove','f.date_approve2'=>'DateApprove2','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'ua1.login'=>'ApprovedBy','ua2.login'=>'ApprovedBy2','fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId',
 											  'p.ref'=>'ProductRef','p.label'=>'ProductLabel','project.rowid'=>'ProjectId','project.ref'=>'ProjectRef','project.title'=>'ProjectLabel');
 		if (empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL))
 		{
 			unset($this->export_fields_array['f.date_approve2']);
 			unset($this->export_fields_array['ua2.login']);
 		}
-		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.fk_statut'=>'Status','f.date_approve'=>'Date','f.date_approve2'=>'Date','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.remise_percent'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.product_type'=>'Numeric','fd.fk_product'=>'List:product:label',
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.date_livraison'=>"Date",'f.total_ht'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.fk_statut'=>'Status','f.date_approve'=>'Date','f.date_approve2'=>'Date','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.remise_percent'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.product_type'=>'Numeric','fd.fk_product'=>'List:product:label',
 		                                          'p.ref'=>'Text','p.label'=>'Text','project.ref'=>'Text','project.title'=>'Text');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','ua1.login'=>'user','ua2.login'=>'user','fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product',
 		                                         'p.ref'=>'product','p.label'=>'product','project.rowid'=>'project','project.ref'=>'project','project.title'=>'project');

htdocs/core/modules/modProduct.class.php

@@ -151,14 +151,14 @@ class modProduct extends DolibarrModules
 		if ($mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly']='NPR';
 		if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Stock','p.seuil_stock_alerte'=>'StockLimit','p.desiredstock'=>'DesiredStock','p.pmp'=>'PMPValue'));
 		if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.barcode'=>'BarCode'));
-		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'SuppliersPrices'));
+		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'BuyingPrice','pf.quantity'=>'QtyMin','pf.remise_percent'=>'DiscountQtyMin'));
 		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.cost_price'=>'CostPrice'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('group_concat(cat.label)'=>'Categories'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel','l.description'=>'TranslatedDescription','l.note'=>'TranslatedNote'));
 		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 		if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.stock'=>'Numeric','p.seuil_stock_alerte'=>'Numeric','p.desiredstock'=>'Numeric','p.pmp'=>'Numeric','p.cost_price'=>'Numeric'));
 		if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text'));
-		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric'));
+		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric','pf.quantity'=>'Numeric','pf.remise_percent'=>'Numeric'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array("group_concat(cat.label)"=>'Text'));
 		$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.url'=>"product",'p.accountancy_code_sell'=>'product','p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product");

htdocs/fourn/card.php

@@ -66,7 +66,7 @@ $hookmanager->initHooks(array('suppliercard','globalcard'));
  * Action
  */
 
-$parameters=array('socid'=>$socid);
+$parameters=array('id'=>$id);
 $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');
 

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1143,6 +1143,7 @@ class CommandeFournisseur extends CommonOrder
 	                    $this->lines[$i]->remise_percent,
 	                    'HT',
 	                    0,
+	                    $this->lines[$i]->product_type,
 	                    $this->lines[$i]->info_bits
 	                );
 	                if ($result < 0)

htdocs/fourn/class/fournisseur.facture.class.php

@@ -1507,7 +1507,7 @@ class FactureFournisseur extends CommonInvoice
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SupplierBillsToPay");
-	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?filtre=fac.fk_statut:1,paye:0&mainmenu=accountancy&leftmenu=suppliers_bills';
+	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?filtre=f.fk_statut:1,paye:0&mainmenu=accountancy&leftmenu=suppliers_bills';
 	        $response->img=img_object($langs->trans("Bills"),"bill");
 
             $facturestatic = new FactureFournisseur($this->db);

htdocs/fourn/class/fournisseur.product.class.php

@@ -581,7 +581,8 @@ class ProductFournisseur extends Product
                 foreach($record_array as $record)
                 {
                     $fourn_price = $record["price"];
-                    $fourn_unitprice = $record["unitprice"];
+                    // discount calculated buy price
+                    $fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) + $record["unitcharges"] - $record["remise"];
                     if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
                         $prod_supplier = new ProductFournisseur($this->db);
                         $prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
@@ -613,7 +614,7 @@ class ProductFournisseur extends Product
                         $this->fourn_qty                = $record["quantity"];
                         $this->fourn_remise_percent     = $record["remise_percent"];
                         $this->fourn_remise             = $record["remise"];
-                        $this->fourn_unitprice          = $fourn_unitprice;
+                        $this->fourn_unitprice          = $record["unitprice"];
                         $this->fourn_charges            = $record["charges"];		// deprecated
                         $this->fourn_unitcharges        = $record["unitcharges"];	// deprecated
                         $this->fourn_tva_tx             = $record["tva_tx"];
@@ -622,7 +623,7 @@ class ProductFournisseur extends Product
 						$this->delivery_time_days		= $record["delivery_time_days"];
                         $this->fk_supplier_price_expression      = $record["fk_supplier_price_expression"];
                         $this->id                       = $prodid;
-                        $min = $this->fourn_unitprice;
+                        $min = $fourn_unitprice;
                     }
                 }
             }

htdocs/fourn/facture/card.php

@@ -456,7 +456,13 @@ if (empty($reshook))
 	                        $date_end=$lines[$i]->date_fin_prevue;
 	                        if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
 	                        if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-
+	                        // Extrafields
+	                        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
+	                        	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+	                        	$targetExtraFields = new ExtraFields($db);
+	                        	$targetExtraFieldLabels = $targetExtraFields->fetch_name_optionals_label($object->table_element_line);
+	                        	$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraFieldLabels);
+	                        }
 	                        // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
 	                        $result = $object->addline(
 	                            $desc,

htdocs/fourn/facture/list.php

@@ -84,9 +84,12 @@ $day_lim	= GETPOST('day_lim','int');
 $month_lim	= GETPOST('month_lim','int');
 $year_lim	= GETPOST('year_lim','int');
 $toselect = GETPOST('toselect', 'array');
+$filter = GETPOST('filtre','alpha');
 
 $option = GETPOST('option');
-if ($option == 'late') $filter = 'paye:0';
+if ($option == 'late') {
+	$filter = 'paye:0';
+}
 
 $search_all = GETPOST('sall');
 $search_label = GETPOST("search_label","alpha");

htdocs/holiday/card.php

@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 $myparam = GETPOST("myparam");
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
+$fuserid = (GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id);
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();

htdocs/index.php

@@ -383,7 +383,7 @@ if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80"
 $boxwork.='</tr>'."\n";
 
 // Do not include sections without management permission
-require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
 if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

@@ -34,6 +34,7 @@ ALTER TABLE llx_product_customer_price ADD COLUMN localtax1_type varchar(10)  NO
 ALTER TABLE llx_product_customer_price ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
 ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax1_type varchar(10)  NOT NULL DEFAULT '0' after localtax1_tx; 
 ALTER TABLE llx_product_customer_price_log ADD COLUMN localtax2_type varchar(10)  NOT NULL DEFAULT '0' after localtax2_tx; 
+ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_supplier_proposal integer NOT NULL;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
 

htdocs/product/stock/replenishorders.php

@@ -29,7 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-require_once './lib/replenishment.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/lib/replenishment.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load("products");
 $langs->load("stocks");
@@ -39,6 +40,46 @@ $langs->load("orders");
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
+$sall = GETPOST('search_all', 'alphanohtml');
+$sref = GETPOST('search_ref', 'alpha');
+$snom = GETPOST('search_nom', 'alpha');
+$suser = GETPOST('search_user', 'alpha');
+$sttc = GETPOST('search_ttc', 'alpha');
+$page = GETPOST('page', 'int');
+$sproduct = GETPOST('sproduct', 'int');
+$search_dateyear = GETPOST('search_dateyear', 'int');
+$search_datemonth = GETPOST('search_datemonth', 'int');
+$search_dateday = GETPOST('search_dateday', 'int');
+$search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield");
+$sortorder = GETPOST("sortorder");
+if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) $sortfield = 'cf.date_creation';
+$page = GETPOST("page");
+if ($page < 0) $page = 0;
+$offset = $limit * $page;
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $sall="";
+    $sref="";
+    $snom="";
+    $suser="";
+    $sttc="";
+    $search_date='';
+    $search_datemonth='';
+    $search_dateday='';
+    $search_dateyear='';
+    $sproduct=0;
+}
+
 
 
 /*
@@ -120,17 +161,18 @@ if ($suser) {
 if ($sttc) {
     $sql .= ' AND cf.total_ttc = ' . price2num($sttc);
 }
-if ($sdate)
+if ($search_datemonth > 0)
 {
-    if (GETPOST('search_datemonth', 'int') && GETPOST('search_dateday', 'int') && GETPOST('search_dateyear', 'int'))
+	if ($search_dateyear > 0 && empty($search_dateday))
-    {
+		$sql.= " AND cf.date_creation BETWEEN '".$db->idate(dol_get_first_day($search_dateyear,$search_datemonth,false))."' AND '".$db->idate(dol_get_last_day($search_dateyear,$search_datemonth,false))."'";
-	    $date = dol_mktime(0, 0, 0, GETPOST('search_datemonth', 'int'), GETPOST('search_dateday', 'int'), GETPOST('search_dateyear', 'int'));
+		else if ($search_dateyear > 0 && ! empty($search_dateday))
-    }
+			$sql.= " AND cf.date_creation BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_datemonth, $search_dateday, $search_dateyear))."'";
-    else
+			else
-    {
+				$sql.= " AND date_format(cf.date_creation, '%m') = '".$search_datemonth."'";
-        $date = dol_stringtotime($sdate);
+}
-    }
+else if ($search_dateyear > 0)
-    $sql .= " AND cf.date_creation = '" . $db->idate($date) . "'";
+{
+	$sql.= " AND cf.date_creation BETWEEN '".$db->idate(dol_get_first_day($search_dateyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_dateyear,12,false))."'";
 }
 if ($sall) {
     $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" ';
@@ -159,6 +201,18 @@ if ($resql)
 
     print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($sref) $param.='&search_ref='.urlencode($sref);
+    if ($snom) $param.='&search_nom='.urlencode($snom);
+    if ($suser) $param.='&search_user='.urlencode($suser);
+    if ($sttc) $param.='&search_ttc='.urlencode($sttc);
+    if ($search_dateyear) $param.='&search_dateyear='.urlencode($search_dateyear);
+    if ($search_datemonth) $param.='&search_datemonth='.urlencode($search_datemonth);
+    if ($search_dateday) $param.='&search_dateday='.urlencode($search_dateday);
+    if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+    
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
 
     print '<table class="noborder" width="100%">'.
@@ -168,7 +222,7 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		'cf.ref',
     		'',
-    		'',
+    		$param,
     		'',
     		$sortfield,
     		$sortorder
@@ -178,7 +232,7 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		's.nom',
     		'',
-    		'',
+    		$param,
     		'',
     		$sortfield,
     		$sortorder
@@ -188,7 +242,7 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		'u.login',
     		'',
-    		'',
+    		$param,
     		'',
     		$sortfield,
     		$sortorder
@@ -198,7 +252,7 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		'cf.total_ttc',
     		'',
-    		'',
+    		$param,
     		'',
     		$sortfield,
     		$sortorder
@@ -208,7 +262,7 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		'cf.date_creation',
     		'',
-    		'',
+    		$param,
     		'',
     		$sortfield,
     		$sortorder
@@ -218,11 +272,12 @@ if ($resql)
     		$_SERVER['PHP_SELF'],
     		'cf.fk_statut',
     		'',
-    		'',
+    		$param,
     		'align="right"',
     		$sortfield,
     		$sortorder
     );
+
     print '</tr>'.
 
          '<tr class="liste_titre">'.
@@ -239,7 +294,7 @@ if ($resql)
          '<input type="text" class="flat" name="search_ttc" value="' . $sttc . '">'.
          '</td>'.
          '<td class="liste_titre">'.
-         $form->select_date('', 'search_date', 0, 0, 1, '', 1, 0, 1, 0, '').
+         $form->select_date($search_date, 'search_date', 0, 0, 1, '', 1, 0, 1, 0, '').
          '</td>'.
          '<td class="liste_titre" align="right">';
     $src = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png';

htdocs/projet/class/task.class.php

@@ -631,7 +631,7 @@ class Task extends CommonObject
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            else 
+            else
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
@@ -884,7 +884,7 @@ class Task extends CommonObject
             $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
             $ret = $tasktime_id;
 			$this->timespent_id = $ret;
-			
+
             if (! $notrigger)
             {
                 // Call trigger
@@ -948,10 +948,10 @@ class Task extends CommonObject
         global $langs;
 
         $id=$this->id;
-        if (empty($id)) 
+        if (empty($id))
         {
             dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
-            return -1; 
+            return -1;
         }
 
         $result=array();
@@ -963,7 +963,7 @@ class Task extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
         if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
-        
+
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1267,7 +1267,7 @@ class Task extends CommonObject
 		$clone_task->fetch($fromid);
 		$clone_task->fetch_optionals();
 		//var_dump($clone_task->array_options);exit;
-		
+
 		$origin_task->fetch($fromid);
 
 		$defaultref='';
@@ -1581,7 +1581,7 @@ class Task extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	
+
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1591,12 +1591,12 @@ 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,";
@@ -1619,29 +1619,29 @@ class Task extends CommonObject
 	    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&mainmenu=project';
 	        $response->img = img_object($langs->trans("Tasks"),"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
@@ -1650,7 +1650,7 @@ class Task extends CommonObject
 	        return -1;
 	    }
 	}
-	
+
 	/**
 	 * Is the task delayed?
 	 *
@@ -1659,7 +1659,7 @@ class Task extends CommonObject
 	public function hasDelay()
 	{
 	    global $conf;
-	
+
         if (! ($this->progress >= 0 && $this->progress < 100)) {
             return false;
         }
@@ -1669,5 +1669,5 @@ class Task extends CommonObject
         $datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
 
         return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
-	}	
+	}
 }

htdocs/societe/consumption.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2015 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015-2017 Ferran Marcet		<fmarcet@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
@@ -245,7 +245,7 @@ if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic=new FactureFournisseur($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_facture_fourn = f.rowid";

htdocs/societe/list.php

@@ -489,7 +489,7 @@ foreach ($search_array_options as $key => $val)
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 	
+}
 
 // Show delete result message
 if (GETPOST('delsoc'))
@@ -599,9 +599,9 @@ if (! empty($arrayfields['s.fk_stcomm']['checked']))      print_liste_field_titr
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
 			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -797,9 +797,9 @@ if (! empty($arrayfields['s.fk_stcomm']['checked']))
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($arrayfields["ef.".$key]['checked'])) 
+		if (! empty($arrayfields["ef.".$key]['checked']))
 		{
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
@@ -854,7 +854,7 @@ while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 	$var=!$var;
-	
+
 	$companystatic->id=$obj->rowid;
 	$companystatic->name=$obj->name;
 	$companystatic->canvas=$obj->canvas;
@@ -865,7 +865,7 @@ while ($i < min($num, $limit))
 	$companystatic->code_fournisseur=$obj->code_fournisseur;
     $companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
     $companystatic->name_alias=$obj->name_alias;
-	
+
 	print "<tr ".$bc[$var].">";
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
@@ -907,12 +907,12 @@ while ($i < min($num, $limit))
     if (! empty($arrayfields['s.zip']['checked']))
     {
         print "<td>".$obj->zip."</td>\n";
-    }        
+    }
     // State
     if (! empty($arrayfields['state.nom']['checked']))
     {
         print "<td>".$obj->state_name."</td>\n";
-    }        
+    }
     // Country
     if (! empty($arrayfields['country.code_iso']['checked']))
     {
@@ -925,7 +925,7 @@ while ($i < min($num, $limit))
     if (! empty($arrayfields['typent.code']['checked']))
     {
         print '<td align="center">';
-		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+        if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
 		print $typenArray[$obj->typent_code];
 		print '</td>';
     }

test/phpunit/AdherentTest.php

@@ -61,7 +61,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -79,7 +81,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { 
+        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }

test/phpunit/AdminLibTest.php

@@ -59,7 +59,9 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -142,21 +144,21 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-    
+
     /**
      * testEnableModule
-     * 
+     *
      * @return  void
      */
     public function testEnableModule()
     {
     	global $conf, $db, $langs, $user;
-    	
+
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
 		$moduledescriptor=new modExpenseReport($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
     }
-    
+
 }

test/phpunit/BankAccountTest.php

@@ -61,7 +61,9 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/BonPrelevementTest.php

@@ -62,6 +62,8 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/BuildDocTest.php

@@ -89,7 +89,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CMailFileTest.php

@@ -59,7 +59,9 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -103,7 +105,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
         $db=$this->savdb;
 
         $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
-        
+
         print __METHOD__."\n";
     }
     /**

test/phpunit/CategorieTest.php

@@ -60,7 +60,9 @@ class CategorieTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/ChargeSocialesTest.php

@@ -60,6 +60,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -117,7 +119,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesCreate
-     * 
+     *
      * @return	void
      */
     public function testChargeSocialesCreate()
@@ -139,10 +141,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesFetch
-     * 
+     *
      * @param	int		$id		Id of social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesCreate
      * The depends says test is run only if previous is ok
      */
@@ -164,10 +166,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesValid
-     * 
+     *
      * @param	Object		$localobject	Social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesFetch
      * The depends says test is run only if previous is ok
      */
@@ -188,10 +190,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesOther
-     * 
+     *
      * @param	Object	$localobject		Social contribution
      * @return	void
-     * 
+     *
      * @depends testChargeSocialesValid
      * The depends says test is run only if previous is ok
      */
@@ -216,10 +218,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesDelete
-     * 
+     *
      * @param	int		$id			Social contribution
      * @return 	void
-     * 
+     *
      * @depends	testChargeSocialesOther
      * The depends says test is run only if previous is ok
      */

test/phpunit/CommandeFournisseurTest.php

@@ -61,7 +61,9 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CommandeTest.php

@@ -59,7 +59,9 @@ class CommandeTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CommonObjectTest.php

@@ -60,7 +60,9 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CompanyBankAccountTest.php

@@ -60,6 +60,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ContactTest.php

@@ -68,6 +68,8 @@ class ContactTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -207,7 +209,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
 		$localobject->email='newemail@newemail.com';
 		$localobject->jabberid='New im id';
 		$localobject->default_lang='es_ES';
-		
+
 		$result=$localobject->update($localobject->id,$user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Contact::update error');

test/phpunit/ContratTest.php

@@ -60,6 +60,8 @@ class ContratTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/CoreTest.php

@@ -62,7 +62,9 @@ class CoreTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -290,22 +292,22 @@ class CoreTest extends PHPUnit_Framework_TestCase
         }
 
         // Run tests
-        
+
         $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
         $result=test_sql_and_script_inject($_SERVER["PHP_SELF"], 2);
         $expectedresult=0;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 1a');
-        
+
         $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
         $result=test_sql_and_script_inject($_SERVER["PHP_SELF"], 2);
         $expectedresult=1;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 1b');
-        
+
         $_GET['aaa']="<img src='1.jpg' onerror =javascript:alert('XSS')>";
         $result=test_sql_and_script_inject($_GET['aaa'], 0);
         $expectedresult=1;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 2');
-        
+
         $_POST['bbb']="<img src='1.jpg' onerror =javascript:alert('XSS')>";
         $result=test_sql_and_script_inject($_POST['bbb'], 2);
         $expectedresult=1;

test/phpunit/DateLibTest.php

@@ -60,6 +60,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -179,32 +181,32 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-    
+
         // With same hours - Tuesday/Wednesday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-    
+
         $result=num_public_holiday($date1,$date2,'FR',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for FR');   // 1 closed days
-    
+
         $result=num_public_holiday($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(0,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for XX');   // no closed days (country unknown)
-        
+
         // With same hours - Friday/Sunday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
-        
+
         $result=num_public_holiday($date1,$date2,'FR',1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2,$result,'NumPublicHoliday for FR');   // 1 opened day, 2 closed days 
+        $this->assertEquals(2,$result,'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
-        
+
         $result=num_public_holiday($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(2,$result,'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
     }
-    
+
     /**
      * testNumOpenDay
      *
@@ -217,32 +219,32 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-        
+
         // With same hours - Tuesday/Wednesday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'FR');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for FR');   // 1 opened days
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'XX');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(2,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for XX');   // 2 opened days (country unknown)
-        
+
         // With same hours - Friday/Sunday jan 2013
         $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
         $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
-        
+
         $result=num_open_day($date1,$date2,0,1,0,'FR');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay for FR');   // 1 opened day, 2 closed
-        
+
         $result=num_open_day($date1,$date2,'XX',1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(1,$result,'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
     }
-    
+
     /**
      * testConvertTime2Seconds
      *

test/phpunit/DateLibTzFranceTest.php

@@ -60,6 +60,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/DiscountTest.php

@@ -60,6 +60,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/EntrepotTest.php

@@ -60,6 +60,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ExportTest.php

@@ -64,6 +64,8 @@ class ExportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureFournisseurTest.php

@@ -60,6 +60,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureRecTest.php

@@ -61,6 +61,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureTest.php

@@ -59,7 +59,9 @@ class FactureTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/FactureTestRounding.php

@@ -60,6 +60,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FichinterTest.php

@@ -60,6 +60,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FilesLibTest.php

@@ -61,6 +61,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -399,7 +401,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".join(',',$result)."\n";
         $this->assertEquals(0,count($result));
     }
-    
+
     /**
      * testDolDirList
      *
@@ -411,7 +413,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
     public function testDolDirList()
     {
         global $conf,$user,$langs,$db;
-    
+
         // Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
         $founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
         print __METHOD__." count(founddirs)=".count($founddirs)."\n";

test/phpunit/FormAdminTest.php

@@ -60,6 +60,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/Functions2LibTest.php

@@ -63,7 +63,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/FunctionsLibTest.php

@@ -63,7 +63,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -130,21 +132,21 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 	    /*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
 	    var_dump($tmp);
 	    */
-	     
+
 	    /*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
 	    var_dump($tmp);
 	    */
-	     
+
 	    $result=dol_buildpath('/google/oauth2callback.php', 2);
 	    print __METHOD__." result=".$result."\n";
 	    $this->assertStringStartsWith('http', $result);
-	     
+
 	    $result=dol_buildpath('/google/oauth2callback.php', 3);
         print __METHOD__." result=".$result."\n";
         $this->assertStringStartsWith('http', $result);
 	}
-    
+
-    
+
     /**
     * testGetBrowserInfo
     *
@@ -999,5 +1001,5 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
 		return true;
 	}
-	
+
 }

test/phpunit/HolidayTest.php

@@ -62,6 +62,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -201,11 +203,11 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 		$localobject->email='newemail@newemail.com';
 		$localobject->jabberid='New im id';
 		$localobject->default_lang='es_ES';
-		
+
 		$result=$localobject->update($localobject->id,$user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Holiday::update error');
-		
+
     	$result=$localobject->update_note($localobject->note_private,'_private');
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
@@ -213,7 +215,7 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
-		
+
 
 		$newobject=new Holiday($this->savdb);
     	$result=$newobject->fetch($localobject->id);

test/phpunit/ImagesLibTest.php

@@ -61,6 +61,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ImportTest.php

@@ -62,6 +62,8 @@ class ImportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/JsonLibTest.php

@@ -62,7 +62,9 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -134,7 +136,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         // Do a test with an array starting with 0
         $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -148,7 +150,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
 		// Same test but array start with 2 instead of 0
         $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -158,7 +160,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=dol_json_decode($encoded,true);
         $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
-        
+
         // Test with object
         $now=gmmktime(12,0,0,1,1,1970);
         $objecttotest=new stdClass();

test/phpunit/LangTest.php

@@ -72,6 +72,8 @@ class LangTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/MarginsLibTest.php

@@ -60,6 +60,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -136,16 +138,15 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(25,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(20,$result[2]);
-		
+
 		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
-		var_dump($result);
 		print __METHOD__." result[0]=".$result[0]."\n";
 		$this->assertEquals(8,$result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
 		$this->assertEquals(12.5,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(1/9*100,$result[2]);
-		
+
 		return 0;
     }
 

test/phpunit/ModulesTest.php

@@ -59,6 +59,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/MouvementStockTest.php

@@ -62,6 +62,8 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/NumberingModulesTest.php

@@ -59,6 +59,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -75,7 +77,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
   	public static function setUpBeforeClass()
     {
     	global $conf,$user,$langs,$db;
-		
+
     	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
@@ -138,7 +140,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
         $conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-        
+
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year

test/phpunit/PaypalTest.php

@@ -61,6 +61,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -135,9 +137,9 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 
 		$urltotest=getPaypalPaymentUrl(1,'free');
 		print "urltotest=".$urltotest."\n";
-		
+
 		$result=getURLContent($urltotest, 'GET');
-		
+
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);
 

test/phpunit/PdfDocTest.php

@@ -63,6 +63,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/PgsqlTest.php

@@ -62,6 +62,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -167,13 +169,13 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
-    	
+
         // Test GROUP_CONCAT (with SEPARATOR)
 		$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
-    	
+
     	return $result;
     }
 }

test/phpunit/PricesTest.php

@@ -67,7 +67,9 @@ class PricesTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -160,8 +162,8 @@ class PricesTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.56),$result1,'Test1 FR');
-		
+
-		
+
         /*
 		 *  Country Spain
 		 */

test/phpunit/ProductTest.php

@@ -60,7 +60,9 @@ class ProductTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/ProjectTest.php

@@ -61,6 +61,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/PropalTest.php

@@ -60,6 +60,8 @@ class PropalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/RestAPIUserTest.php

@@ -64,7 +64,9 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -106,7 +108,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-        
+
         $this->api_url=DOL_MAIN_URL_ROOT.'/api/index.php';
 
         $login='admin';
@@ -149,7 +151,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
 
       $url = $this->api_url.'/user/123456789?api_key='.$this->api_key;
       //$addheaders=array('Content-Type: application/json');
-      
+
       print __METHOD__." Request url=".$url."\n";
       $result=getURLContent($url, 'GET', '', 1, array());
       //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
@@ -158,7 +160,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(404, $object['error']['code']);
-      
+
       $url = $this->api_url.'/user/1?api_key='.$this->api_key;
 
       print __METHOD__." Request url=".$url."\n";
@@ -172,18 +174,18 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
     }
 
     public function testRestCreateUser() {
-      
+
       // attemp to create without mandatory fields :
       $url = $this->api_url.'/user?api_key='.$this->api_key;
       $addheaders=array('Content-Type: application/json');
-      
+
       $bodyobj = array(
         "lastname"=>"testRestUser",
         "password"=>"testRestPassword",
         "email"=>"test@restuser.com"
       );
       $body = json_encode($bodyobj);
-      
+
       print __METHOD__." Request url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
@@ -207,17 +209,17 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       print __METHOD__." Result code for creating user ".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
       $this->assertEquals($result['curl_error_no'],'');
-      $object=json_decode($result['content'], true);      
+      $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertGreaterThan(0, $object['id'], $object['error']['code'].' '.$object['error']['message']);
-      
+
       // attempt to create duplicated user
       print __METHOD__." Request url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
       $this->assertEquals($result['curl_error_no'],'');
-      $object=json_decode($result['content'], true);      
+      $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
     }

test/phpunit/ScriptsTest.php

@@ -72,6 +72,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/SecurityTest.php

@@ -72,6 +72,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/SocieteTest.php

@@ -60,7 +60,9 @@ class SocieteTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/SqlTest.php

@@ -72,7 +72,9 @@ class SqlTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -143,16 +145,16 @@ class SqlTest extends PHPUnit_Framework_TestCase
 
         $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-        foreach ($listofsqldir as $dir) 
+        foreach ($listofsqldir as $dir)
         {
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
-        
+
-            foreach($filesarray as $key => $file) 
+            foreach($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/',$file))
                     continue;
-                    
+
                 print 'Check sql file '.$file."\n";
                 $filecontent=file_get_contents($dir.'/'.$file);
 
@@ -167,7 +169,7 @@ class SqlTest extends PHPUnit_Framework_TestCase
                 $result=strpos($filecontent,'ON DELETE CASCADE');
                 print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
-                
+
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
@@ -176,9 +178,9 @@ class SqlTest extends PHPUnit_Framework_TestCase
                 else
                 {
                     if (preg_match('/\.key\.sql$/',$file))
-                    {                
+                    {
                         // Test for files key files only
-                    
+
                     }
                     else
                     {

test/phpunit/UserGroupTest.php

@@ -59,7 +59,9 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -117,7 +119,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupCreate
-     * 
+     *
      * @return	void
      */
     public function testUserGroupCreate()
@@ -139,7 +141,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupFetch
-     * 
+     *
      * @param   int $id             Id of group
      * @return  void
      * @depends testUserGroupCreate
@@ -163,7 +165,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupUpdate
-     * 
+     *
      * @param   Object $localobject Group
      * @return  void
      * @depends testUserGroupFetch
@@ -187,7 +189,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupAddRight
-     * 
+     *
      * @param   Object $localobject Object to show
      * @return  void
      * @depends testUserGroupUpdate
@@ -210,7 +212,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelRight
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupAddRight
@@ -233,7 +235,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupOther
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupDelRight
@@ -261,7 +263,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelete
-     * 
+     *
      * @param   int $id             Id of object
      * @return  void
      * @depends testUserGroupOther

test/phpunit/UserTest.php

@@ -59,7 +59,9 @@ class UserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesInvoicesTest.php

@@ -55,9 +55,9 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 	protected $savdb;
 	protected $soapclient;
 	protected $socid;
-	
+
 	protected $ns = 'http://www.dolibarr.org/ns/';
-	
+
 	/**
 	 * Constructor
 	 * We save global variables into local variables
@@ -66,6 +66,8 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -73,8 +75,8 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 		$this->savlangs=$langs;
 		$this->savdb=$db;
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
-		
+
-		
+
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$this->soapclient = new nusoap_client($WS_DOL_URL);
@@ -83,7 +85,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 			$this->soapclient->soap_defencoding='UTF-8';
 			$this->soapclient->decodeUTF8(false);
 		}
-		
+
 		// create third_parties, needed to test an invoice
 		$societe=new Societe($db);
 		$societe->ref='';
@@ -95,11 +97,11 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 		$societe->date_creation=$now;
 		$societe->tva_assuj=0;
 		$societe->particulier=0;
-		
+
 		$societe->create($user);
-		
+
 		$this->socid = $societe->id;
-		
+
 		print __METHOD__." societe created id=".$societe->id."\n";
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
@@ -135,9 +137,9 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
-				
+
 		print __METHOD__."\n";
-		
+
     }
 
 	/**
@@ -171,7 +173,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
     	$societe->fetch('', '', 'ref-phpunit');
     	print __METHOD__." societe loaded id=".$societe->id."\n";
         */
-    	
+
     	$body = array (
     			"id" => NULL,
 				"ref" => NULL,
@@ -252,13 +254,13 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-    
+
     /**
      * testWSInvoicesGetInvoiceByRefExt
-     * 
+     *
      * Retrieve an invoice using ref_ext
      * @depends testWSInvoicesCreateInvoice
-     * 
+     *
      * @param	array	$result		Invoice created by create method
      * @return	array				Invoice
      */
@@ -308,13 +310,13 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-    
+
     /**
      * testWSInvoicesUpdateInvoiceByRefExt
-     * 
+     *
      * Update an invoice using ref_ext
      * @depends testWSInvoicesCreateInvoice
-     * 
+     *
      * @param	array	$result		invoice created by create method
      * @return	array 				Invoice
      */

test/phpunit/WebservicesOrdersTest.php

@@ -61,7 +61,9 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesOtherTest.php

@@ -61,7 +61,9 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesProductsTest.php

@@ -68,7 +68,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesThirdpartyTest.php

@@ -53,12 +53,12 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     protected $savlangs;
     protected $savdb;
     protected $soapclient;
-    
+
     private $_WS_DOL_URL;
     private $_ns='http://www.dolibarr.org/ns/';
-    
+
-    
+
-    
+
 
     /**
      * Constructor
@@ -68,15 +68,17 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
         $this->savlangs=$langs;
         $this->savdb=$db;
-        
+
         $this->_WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
-        
+
         // Set the WebService URL
         print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
         $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
@@ -146,10 +148,10 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$user=$this->savuser;
     	$langs=$this->savlangs;
     	$db=$this->savdb;
-    
+
     	$WS_METHOD  = 'createThirdParty';
-   
+
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -157,7 +159,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	$body = array (
     			"id" => NULL,
     			"ref" => "name",
@@ -195,7 +197,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			"vat_used" => "",
     			"vat_number" => ""
     	);
-    	
+
     	// Test URL
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
@@ -215,20 +217,20 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     		print $this->soapclient->response;
     		print "\n";
     	}
-    
+
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('name',$result['ref']);    	 
+    	$this->assertEquals('name',$result['ref']);
-    
+
     	return $result;
     }
 
     /**
      * testWSThirdpartygetThirdPartyById
-     * 
+     *
      * Use id to retrieve thirdparty
      * @depends testWSThirdpartycreateThirdParty
-     * 
+     *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirpdarty updated
      */
@@ -278,18 +280,18 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('0', $result['thirdparty']['status']);
         $this->assertEquals('1', $result['thirdparty']['client']);
         $this->assertEquals('0', $result['thirdparty']['supplier']);
-        
+
-        
+
         return $result;
     }
-    
+
     /**
      * testWSThirdpartygetThirdPartyByRefExt
      *
      * Use ref_ext to retrieve thirdparty
      *
 	 * @depends testWSThirdpartycreateThirdParty
-	 * 
+	 *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirdparty
      */
@@ -301,9 +303,9 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
     	$id = $result['id'];
-    
+
     	$WS_METHOD  = 'getThirdParty';
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -311,7 +313,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	// Test URL
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
@@ -332,7 +334,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     		print $this->soapclient->response;
     		print "\n";
     	}
-        
+
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
     	$this->assertEquals($id, $result['thirdparty']['id']);
@@ -341,11 +343,11 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$this->assertEquals('0', $result['thirdparty']['status']);
     	$this->assertEquals('1', $result['thirdparty']['client']);
     	$this->assertEquals('0', $result['thirdparty']['supplier']);
-    
+
-    
+
     	return $result;
     }
-    
+
     /**
      * testWSThirdpartydeleteThirdParty
      *
@@ -362,9 +364,9 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
     	$id = $result['id'];
-    
+
     	$WS_METHOD  = 'deleteThirdParty';
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -372,7 +374,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
     	print __METHOD__." call method ".$WS_METHOD."\n";
@@ -393,7 +395,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
-    
+
     	return $result;
     }
 

test/phpunit/WebservicesUserTest.php

@@ -61,7 +61,9 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/XCalLibTest.php

@@ -59,7 +59,9 @@ class XCalLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;