Merge remote-tracking branch 'upstream/develop' into camelCaps

build/rpm/dolibarr_fedora.spec

@@ -212,6 +212,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
+%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices

build/rpm/dolibarr_generic.spec

@@ -292,6 +292,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
+%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices

build/rpm/dolibarr_mandriva.spec

@@ -209,6 +209,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
+%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices

build/rpm/dolibarr_opensuse.spec

@@ -220,6 +220,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
+%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices

dev/setup/codesniffer/ruleset.xml

@@ -218,9 +218,9 @@
         <severity>5</severity>
     </rule>
 
-	<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+	<!--<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
         <severity>0</severity>
-    </rule>
+    </rule>-->
     <rule ref="PEAR.Commenting.FunctionComment.Missing">
         <severity>0</severity>
     </rule>

htdocs/accountancy/class/accountancyexport.class.php

@@ -185,6 +185,7 @@ class AccountancyExport
 	 * Function who chose which export to use with the default config
 	 *
 	 * @param unknown $TData data
+     * @return void
 	 */
 	public function export(&$TData) {
 		global $conf, $langs;
@@ -602,6 +603,7 @@ class AccountancyExport
 	 *
 	 * @param unknown $str data
 	 * @param integer $size data
+     * @return string
 	 */
 	public static function trunc($str, $size) {
 		return dol_trunc($str, $size, 'right', 'UTF-8', 1);

htdocs/adherents/class/adherent.class.php

@@ -2466,6 +2466,7 @@ class Adherent extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
+     * @return void
 	 */
 	public function setCategories($categories)
 	{

htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php

@@ -82,6 +82,7 @@ class PrestaShopWebservice
 	 * Take the status code and throw an exception if the server didn't return 200 or 201 code
 	 *
 	 * @param int $status_code Status code of an HTTP return
+     * @return void
 	 */
 	protected function checkStatusCode($status_code)
 	{

htdocs/api/class/api.class.php

@@ -217,6 +217,7 @@ class DolibarrApi
 	 * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
 	 * @param string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
 	 * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
+     * @return bool
 	 * @throws RestException
 	 */
 	static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') {

htdocs/api/class/api_setup.class.php

@@ -188,6 +188,7 @@ class Setup extends DolibarrApi
      * @param int       $id        ID of country
      * @param string    $lang      Code of the language the name of the
      *                             country must be translated to
+     * @return array 			   Array of cleaned object properties
      *
      * @url     GET dictionary/countries/{id}
      *
@@ -293,6 +294,7 @@ class Setup extends DolibarrApi
      * @param Ccountry $country   Country
      * @param string   $lang      Code of the language the name of the
      *                            country must be translated to
+     * @return void
      */
     private function translateLabel($country, $lang)
     {

htdocs/api/class/api_status.class.php

@@ -28,6 +28,7 @@ class Status
 {
 	/**
      * Get status (Dolibarr version)
+     * @return array
 	 */
 	function index() {
 		global $conf;

htdocs/blockedlog/class/authority.class.php

@@ -105,7 +105,8 @@ class BlockedLogAuthority
 	/**
 	 *	Add a new block to the chain
 	 *
-	 *	@param      string		$block		new block to chain
+     *	@param      string		$block		new block to chain
+     *  @return void
 	 */
 	public function addBlock($block) {
 

htdocs/blockedlog/class/blockedlog.class.php

@@ -18,9 +18,6 @@
  * See https://medium.com/@lhartikk/a-blockchain-in-200-lines-of-code-963cc1cc0e54
  */
 
-
-
-
 /*ini_set('unserialize_callback_func', 'mycallback');
 
 function mycallback($classname)
@@ -171,6 +168,7 @@ class BlockedLog
 
 	/**
 	 *  Try to retrieve source object (it it still exists)
+     * @return string
 	 */
 	public function getObjectLink()
 	{
@@ -286,6 +284,7 @@ class BlockedLog
 
 	/**
 	 *      try to retrieve user author
+     * @return string
 	 */
 	public function getUser()
 	{
@@ -1029,6 +1028,7 @@ class BlockedLog
 	 * Check if module was already used or not for at least one recording.
 	 *
 	 * @param	int		$ignoresystem		Ignore system events for the test
+     * @return bool
 	 */
 	function alreadyUsed($ignoresystem=0)
 	{

htdocs/compta/bank/class/account.class.php

@@ -946,6 +946,7 @@ class Account extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
+     * @return void
 	 */
 	public function setCategories($categories) {
 		// Handle single category

htdocs/compta/facture/card.php

@@ -4030,8 +4030,6 @@ else if ($id > 0 || ! empty($ref))
 	print '</table>';
 
 
-	// List of previous situation invoices
-
 	$sign = 1;
 	if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = - 1;
 	$nbrows = 8;
@@ -4372,7 +4370,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 	else // Credit note
 	{
-		$cssforamountpaymentcomplete='';
+		$cssforamountpaymentcomplete='amountpaymentneutral';
 
 		// Total already paid back
 		print '<tr><td colspan="' . $nbcols . '" align="right">';
@@ -4387,7 +4385,7 @@ else if ($id > 0 || ! empty($ref))
 		if ($resteapayeraffiche <= 0)
 			print $langs->trans('RemainderToPayBack');
 		else
-			print $langs->trans('ExcessPaydBack');
+			print $langs->trans('ExcessPaid');
 		print ' :</td>';
 		print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopayback"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($sign * $resteapayeraffiche) . '</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';

htdocs/contact/class/contact.class.php

@@ -1341,6 +1341,7 @@ class Contact extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
+     * @return void
 	 */
 	public function setCategories($categories)
 	{

htdocs/core/ajax/ziptown.php

@@ -120,6 +120,7 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 			$row_array['selectcountry_id'] = $row['fk_country'];
 			$row_array['state_id'] = $row['fk_county'];
 
+			// TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
 			$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
 
 			array_push($return_arr,$row_array);

htdocs/core/class/commonobject.class.php

@@ -6841,6 +6841,7 @@ abstract class CommonObject
 	 * Function to load data from a SQL pointer into properties of current object $this
 	 *
 	 * @param   stdClass    $obj    Contain data of object from database
+     * @return void
 	 */
 	protected function setVarsFromFetchObj(&$obj)
 	{

htdocs/core/class/coreobject.class.php

@@ -1,6 +1,6 @@
 <?php
 /* EXPERIMENTAL
- * 
+ *
  * Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *	\ingroup    core
  *	\brief      File of class to manage all object. Might be replace or merge into commonobject
  */
- 
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class CoreObject extends CommonObject
@@ -54,7 +54,7 @@ class CoreObject extends CommonObject
 		$this->id = 0;
 		$this->datec = 0;
 		$this->tms = 0;
-		
+
 		if (!empty($this->fields))
 		{
 			foreach ($this->fields as $field=>$info)
@@ -68,14 +68,14 @@ class CoreObject extends CommonObject
 
             $this->to_delete=false;
             $this->is_clone=false;
-			
+
 			return true;
 		}
 		else
         {
 			return false;
 		}
-			
+
 	}
 
     /**
@@ -110,7 +110,7 @@ class CoreObject extends CommonObject
     	if($res>0) {
     		if ($loadChild) $this->fetchChild();
     	}
-    	
+
     	return $res;
 	}
 
@@ -133,14 +133,14 @@ class CoreObject extends CommonObject
 				if($object->{$key} === $id) return $k;
 			}
 		}
-	
+
 		$k = count($this->{$tabName});
-	
+
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
 		if($id>0 && $key==='id' && $try_to_load)
 		{
-			$this->{$tabName}[$k]->fetch($id); 
+			$this->{$tabName}[$k]->fetch($id);
 		}
 
 		return $k;
@@ -171,6 +171,8 @@ class CoreObject extends CommonObject
 
     /**
      * Function to fetch children objects
+     *
+     * @return void
      */
     public function fetchChild()
     {
@@ -207,6 +209,7 @@ class CoreObject extends CommonObject
      * Function to update children data
      *
      * @param   User    $user   user object
+     * @return void
      */
 	public function saveChild(User &$user)
     {
@@ -220,7 +223,7 @@ class CoreObject extends CommonObject
 					foreach($this->{$className} as $i => &$object)
 					{
 						$object->{$this->fk_element} = $this->id;
-						
+
 						$object->update($user);
 						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
 					}

htdocs/core/class/html.formcompany.class.php

@@ -206,7 +206,7 @@ class FormCompany
 	 *
 	 *    @param	string	$selected        	Code state preselected (mus be state id)
 	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
-	 *    @param    string	$htmlname			Id of department
+	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country
 	 */
@@ -221,7 +221,7 @@ class FormCompany
 
 		$out='';
 
-		// On recherche les departements/cantons/province active d'une region et pays actif
+		// Serch departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
 		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
@@ -230,7 +230,6 @@ class FormCompany
 		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		$sql .= " ORDER BY c.code, d.code_departement";
 
-		dol_syslog(get_class($this)."::select_departement", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -302,9 +301,12 @@ class FormCompany
 			dol_print_error($this->db);
 		}
 
-        // Make select dynamic
+		// Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+		if (! empty($htmlname))
-        $out .= ajax_combobox($htmlname);
+		{
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
 
 		return $out;
 	}

htdocs/core/lib/company.lib.php

@@ -89,7 +89,7 @@ function societe_prepare_head(Societe $object)
         $head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
         $head[$h][1] = '';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client==2 || $object->client==3)) $head[$h][1] .= $langs->trans("Prospect");
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client==3) $head[$h][1] .= '/';
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client==3) $head[$h][1] .= ' | ';
         if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client==1 || $object->client==3)) $head[$h][1] .= $langs->trans("Customer");
         $head[$h][2] = 'customer';
         $h++;

htdocs/core/lib/functions.lib.php

@@ -1594,6 +1594,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
  * @param	string	$langkey		Translation key
  * @param 	string	$fieldkey		Key of the html select field the text refers to
  * @param	int		$fieldrequired	1=Field is mandatory
+ * @return string
  * @deprecated Form::editfieldkey
  */
 function fieldLabel($langkey, $fieldkey, $fieldrequired=0)
@@ -7431,6 +7432,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
  *
  * @param string	$htmlname	Id of html object
  * @param string	$addlink	Add a 'link to' after
+ * @return string
  */
 function ajax_autoselect($htmlname, $addlink='')
 {
@@ -7568,6 +7570,7 @@ function dol_mimetype($file, $default='application/octet-stream', $mode=0)
  * @param int		$id				id of line
  * @param bool		$checkentity	add filter on entity
  * @param string	$rowidfield		name of the column rowid
+ * @return string
  */
 function getDictvalue($tablename, $field, $id, $checkentity=false, $rowidfield='rowid')
 {

htdocs/core/lib/functionsnumtoword.lib.php

@@ -21,12 +21,12 @@
  *	\brief			A set of functions for Dolibarr
  *					This file contains all frequently used functions.
  */
- 
+
- 
+
 /**
  * Function to return number in text.
- * 
+ *
- * 
+ *
  * @param	float 	$num			Number to convert
  * @param	Lang	$langs			Language
  * @param	boolean	$currency		0=number to translate | 1=currency to translate
@@ -36,7 +36,7 @@
 function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
 {
 	global $conf;
-	
+
     $num = str_replace(array(',', ' '), '', trim($num));
     if(! $num) {
         return false;
@@ -48,49 +48,49 @@ function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
     $num = (int) $TNum[0];
     $words = array();
     $list1 = array(
-    	'', 
+    	'',
-    	$langs->transnoentitiesnoconv('one'), 
+    	$langs->transnoentitiesnoconv('one'),
-    	$langs->transnoentitiesnoconv('two'), 
+    	$langs->transnoentitiesnoconv('two'),
-    	$langs->transnoentitiesnoconv('three'), 
+    	$langs->transnoentitiesnoconv('three'),
-    	$langs->transnoentitiesnoconv('four'), 
+    	$langs->transnoentitiesnoconv('four'),
-    	$langs->transnoentitiesnoconv('five'), 
+    	$langs->transnoentitiesnoconv('five'),
-    	$langs->transnoentitiesnoconv('six'), 
+    	$langs->transnoentitiesnoconv('six'),
-    	$langs->transnoentitiesnoconv('seven'), 
+    	$langs->transnoentitiesnoconv('seven'),
-    	$langs->transnoentitiesnoconv('eight'), 
+    	$langs->transnoentitiesnoconv('eight'),
-    	$langs->transnoentitiesnoconv('nine'), 
+    	$langs->transnoentitiesnoconv('nine'),
-    	$langs->transnoentitiesnoconv('ten'), 
+    	$langs->transnoentitiesnoconv('ten'),
     	$langs->transnoentitiesnoconv('eleven'),
-        $langs->transnoentitiesnoconv('twelve'), 
+        $langs->transnoentitiesnoconv('twelve'),
-        $langs->transnoentitiesnoconv('thirteen'), 
+        $langs->transnoentitiesnoconv('thirteen'),
-        $langs->transnoentitiesnoconv('fourteen'), 
+        $langs->transnoentitiesnoconv('fourteen'),
-        $langs->transnoentitiesnoconv('fifteen'), 
+        $langs->transnoentitiesnoconv('fifteen'),
-        $langs->transnoentitiesnoconv('sixteen'), 
+        $langs->transnoentitiesnoconv('sixteen'),
-        $langs->transnoentitiesnoconv('seventeen'), 
+        $langs->transnoentitiesnoconv('seventeen'),
-        $langs->transnoentitiesnoconv('eighteen'), 
+        $langs->transnoentitiesnoconv('eighteen'),
         $langs->transnoentitiesnoconv('nineteen')
     );
     $list2 = array(
-    	'', 
+    	'',
-	    $langs->transnoentitiesnoconv('ten'), 
+	    $langs->transnoentitiesnoconv('ten'),
-	    $langs->transnoentitiesnoconv('twenty'), 
+	    $langs->transnoentitiesnoconv('twenty'),
-	    $langs->transnoentitiesnoconv('thirty'), 
+	    $langs->transnoentitiesnoconv('thirty'),
-	    $langs->transnoentitiesnoconv('forty'), 
+	    $langs->transnoentitiesnoconv('forty'),
-	    $langs->transnoentitiesnoconv('fifty'), 
+	    $langs->transnoentitiesnoconv('fifty'),
-	    $langs->transnoentitiesnoconv('sixty'), 
+	    $langs->transnoentitiesnoconv('sixty'),
-	    $langs->transnoentitiesnoconv('seventy'), 
+	    $langs->transnoentitiesnoconv('seventy'),
-	    $langs->transnoentitiesnoconv('eighty'), 
+	    $langs->transnoentitiesnoconv('eighty'),
-	    $langs->transnoentitiesnoconv('ninety'), 
+	    $langs->transnoentitiesnoconv('ninety'),
 	    $langs->transnoentitiesnoconv('hundred')
 	);
     $list3 = array(
-    	'', 
+    	'',
-    	$langs->transnoentitiesnoconv('thousand'), 
+    	$langs->transnoentitiesnoconv('thousand'),
-    	$langs->transnoentitiesnoconv('million'), 
+    	$langs->transnoentitiesnoconv('million'),
-    	$langs->transnoentitiesnoconv('billion'), 
+    	$langs->transnoentitiesnoconv('billion'),
-    	$langs->transnoentitiesnoconv('trillion'), 
+    	$langs->transnoentitiesnoconv('trillion'),
     	$langs->transnoentitiesnoconv('quadrillion')
     );
-	
+
     $num_length = strlen($num);
     $levels = (int) (($num_length + 2) / 3);
     $max_length = $levels * 3;
@@ -120,11 +120,11 @@ function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
 	$concatWords = implode(' ', $words);
 	// Delete multi whitespaces
 	$concatWords = trim(preg_replace('/[ ]+/', ' ', $concatWords));
-	
+
 	if(!empty($currency)) {
 		$concatWords .= ' '.$currency;
 	}
-	
+
 	// If we need to write cents call again this function for cents
 	if(!empty($TNum[1])) {
 		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
@@ -133,11 +133,11 @@ function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
 	}
     return $concatWords;
 }
- 
+
- 
+
 /**
  * Function to return number or amount in text.
- * 
+ *
  * @deprecated
  * @param	float 	$numero			Number to convert
  * @param	Lang	$langs			Language
@@ -164,7 +164,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency='number')
 	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
 	if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
-	{	
+	{
 		if ($numero>=1 && $numero<2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
 		}
@@ -229,10 +229,11 @@ function dolNumberToWord($numero, $langs, $numorcurrency='number')
 
 /**
  * hundreds2text
- * 
+ *
  * @param integer $hundreds     Hundreds
  * @param integer $tens         Tens
  * @param integer $units        Units
+ * @return string
  */
 function hundreds2text($hundreds, $tens, $units)
 {

htdocs/core/lib/pdf.lib.php

@@ -263,6 +263,7 @@ function pdf_getHeightForLogo($logo, $url = false)
  *
  * @param TCPDF     $pdf            PDF initialized object
  * @param string    $htmlcontent    HTML Contect
+ * @return number
  * @see getStringHeight
  */
 function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
@@ -2120,4 +2121,3 @@ function pdf_getSizeForImage($realpath)
 	}
 	return array('width'=>$width,'height'=>$height);
 }
-

htdocs/core/menus/standard/eldy.lib.php

@@ -150,11 +150,10 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (! empty($conf->salaries->enabled)) $menuqualified++;
 	if (! empty($conf->supplier_invoice->enabled)) $menuqualified++;
 	if (! empty($conf->loan->enabled)) $menuqualified++;
-	if (! empty($conf->banque->enabled)) $menuqualified++;
 	$tmpentry=array(
 	   'enabled'=>$menuqualified,
-	   'perms'=>(! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read) || ! empty($user->rights->banque->lire)),
+	   'perms'=>(! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
-	   'module'=>'facture|supplier_invoice|don|tax|salaries|loan|banque');
+	   'module'=>'facture|supplier_invoice|don|tax|salaries|loan');
 	$showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{

htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php

@@ -77,6 +77,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 * @param int	  $y		   y position in user units
 	 * @param int	  $w		   width in user units
 	 * @param int	  $h		   height in user units
+     * @return void
 	 */
 	private function writeBarcode(&$pdf, $code, $encoding, $is2d, $x, $y, $w, $h)
 	{

htdocs/expensereport/class/expensereport.class.php

@@ -1302,6 +1302,7 @@ class ExpenseReport extends CommonObject
      * @param User      $fuser      User
      * @param Details   $details    Details
 	 * @param int       $notrigger  Disable triggers
+     * @return int
      */
     function setDeny($fuser,$details,$notrigger=0)
     {

htdocs/fourn/facture/card.php

@@ -2904,7 +2904,7 @@ else
 			if ($resteapayeraffiche <= 0)
 				print $langs->trans('RemainderToPayBack');
 			else
-				print $langs->trans('ExcessPaydBack');
+				print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($sign * $resteapayeraffiche) . '</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';

htdocs/install/mysql/migration/7.0.0-8.0.0.sql

@@ -32,6 +32,10 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+-- Forgot in < 4.0
+
+ALTER TABLE llx_c_ziptown DROP FOREIGN KEY fk_c_ziptown_fk_pays;
+ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country(rowid);
 
 -- Forgot in 7.0
 
@@ -49,6 +53,7 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, ent
 UPDATE llx_const set name = __ENCRYPT('INVOICE_FREE_TEXT')__  where name = __ENCRYPT('FACTURE_FREE_TEXT')__;
 
 
+
 -- drop very old table (bad name)
 DROP TABLE llx_c_accountancy_category;
 DROP TABLE llx_c_accountingaccount;

htdocs/langs/en_US/agenda.lang

@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Define here events for which you want Dolibarr to create a
 AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
 ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Third party %s created
 ContractValidatedInDolibarr=Contract %s validated

htdocs/langs/en_US/errors.lang

@@ -65,8 +65,9 @@ ErrorNoValueForSelectType=Please fill value for select list
 ErrorNoValueForCheckBoxType=Please fill value for checkbox list
 ErrorNoValueForRadioType=Please fill value for radio list
 ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
+ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=No accountancy module activated
 ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.

htdocs/langs/en_US/website.lang

@@ -62,6 +62,7 @@ CreateByFetchingExternalPage=Create page/container by fetching page from externa
 OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
+ImportSite=Import site
 IDOfPage=Id of page
 Banner=Banner
 BlogPost=Blog post
@@ -84,4 +85,5 @@ SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ExternalURLMustStartWithHttp=External URL must start with http:// or https://
+ZipOfWebsitePackageToImport=Zip file of website package

htdocs/modulebuilder/admin/setup.php

@@ -155,5 +155,6 @@ if (GETPOST('withtab', 'alpha')) {
 
 print '<br><br>';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/index.php

@@ -2487,8 +2487,6 @@ elseif (! empty($module))
 
 dol_fiche_end(); // End modules
 
-
+// End of page
-
 llxFooter();
-
 $db->close();

htdocs/modulebuilder/template/mymoduleindex.php

@@ -233,6 +233,6 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/modulebuilder/template/myobject_agenda.php

@@ -256,7 +256,6 @@ if ($object->id > 0)
     }
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/modulebuilder/template/myobject_card.php

@@ -467,7 +467,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/template/myobject_document.php

@@ -161,6 +161,6 @@ else
 	accessforbidden('',0,0);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/template/myobject_note.php

@@ -159,6 +159,6 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_end();
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php

@@ -99,6 +99,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Global test setup
+     * @return void
 	 */
 	public static function setUpBeforeClass()
 	{
@@ -106,6 +107,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Unit test setup
+     * @return void
 	 */
 	public function setUp()
 	{
@@ -115,6 +117,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Verify pre conditions
+     * @return void
 	 */
 	protected function assertPreConditions()
 	{
@@ -122,6 +125,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Handle Dolibarr authentication
+     * @return void
 	 */
 	private function authenticate()
 	{
@@ -142,6 +146,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Test enabling developer mode
+     * @return bool
 	 */
 	public function testEnableDeveloperMode()
 	{
@@ -161,6 +166,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test enabling the module
 	 *
 	 * @depends testEnableDeveloperMode
+     * @return bool
 	 */
 	public function testModuleEnabled()
 	{
@@ -186,6 +192,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test access to the configuration page
 	 *
 	 * @depends testModuleEnabled
+     * @return bool
 	 */
 	public function testConfigurationPage()
 	{
@@ -198,6 +205,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test access to the about page
 	 *
 	 * @depends testConfigurationPage
+     * @return bool
 	 */
 	public function testAboutPage()
 	{
@@ -210,6 +218,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test about page is rendering Markdown
 	 *
 	 * @depends testAboutPage
+     * @return bool
 	 */
 	public function testAboutPageRendersMarkdownReadme()
 	{
@@ -226,6 +235,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test box is properly declared
 	 *
 	 * @depends testModuleEnabled
+     * @return bool
 	 */
 	public function testBoxDeclared()
 	{
@@ -238,6 +248,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test trigger is properly enabled
 	 *
 	 * @depends testModuleEnabled
+     * @return bool
 	 */
 	public function testTriggerDeclared()
 	{
@@ -254,6 +265,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	 * Test trigger is properly declared
 	 *
 	 * @depends testTriggerDeclared
+     * @return bool
 	 */
 	public function testTriggerEnabled()
 	{
@@ -268,6 +280,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Verify post conditions
+     * @return void
 	 */
 	protected function assertPostConditions()
 	{
@@ -275,6 +288,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Unit test teardown
+     * @return void
 	 */
 	public function tearDown()
 	{
@@ -282,6 +296,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 
 	/**
 	 * Global test teardown
+     * @return void
 	 */
 	public static function tearDownAfterClass()
 	{

htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php

@@ -32,6 +32,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * Global test setup
+     * @return void
 	 */
 	public static function setUpBeforeClass()
 	{
@@ -40,6 +41,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test setup
+     * @return void
 	 */
 	protected function setUp()
 	{
@@ -48,6 +50,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Verify pre conditions
+     * @return void
 	 */
 	protected function assertPreConditions()
 	{
@@ -56,6 +59,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * A sample test
+     * @return bool
 	 */
 	public function testSomething()
 	{
@@ -66,6 +70,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Verify post conditions
+     * @return void
 	 */
 	protected function assertPostConditions()
 	{
@@ -74,6 +79,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test teardown
+     * @return void
 	 */
 	protected function tearDown()
 	{
@@ -82,6 +88,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Global test teardown
+     * @return void
 	 */
 	public static function tearDownAfterClass()
 	{
@@ -92,6 +99,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 * Unsuccessful test
 	 *
 	 * @param  Exception $e    Exception
+     * @return void
 	 * @throws Exception
 	 */
 	protected function onNotSuccessfulTest(Exception $e)

htdocs/multicurrency/class/multicurrency.class.php

@@ -93,7 +93,7 @@ class MultiCurrency extends CommonObject
 	public function __construct(DoliDB $db)
 	{
 		$this->db = &$db;
-		
+
 		return 1;
 	}
 
@@ -108,21 +108,21 @@ class MultiCurrency extends CommonObject
 	public function create(User $user, $trigger = true)
 	{
 		global $conf,$langs;
-		
+
 		dol_syslog('Currency::create', LOG_DEBUG);
 
 		$error = 0;
-		
+
 		if (self::checkCodeAlreadyExists($this->code))
 		{
 			$error++;
 			$this->errors[] = $langs->trans('multicurrency_code_already_added');
 			return -1;
 		}
-		
+
 		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
 		$now=date('Y-m-d H:i:s');
-		
+
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		$sql .= ' code,';
@@ -152,7 +152,7 @@ class MultiCurrency extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 			$this->date_create = $now;
 			$this->fk_user = $user->id;
-			
+
 			if ($trigger) {
 				$result=$this->call_trigger('CURRENCY_CREATE', $user);
 				if ($result < 0) $error++;
@@ -181,7 +181,7 @@ class MultiCurrency extends CommonObject
 	public function fetch($id, $code = null)
 	{
 		dol_syslog('Currency::fetch', LOG_DEBUG);
-		
+
 		global $conf;
 
 		$sql = 'SELECT';
@@ -192,7 +192,7 @@ class MultiCurrency extends CommonObject
 
 		dol_syslog(__METHOD__,LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
 			if ($numrows) {
@@ -204,7 +204,7 @@ class MultiCurrency extends CommonObject
 				$this->entity = $obj->entity;
 				$this->date_create = $obj->date_create;
 				$this->fk_user = $obj->fk_user;
-				
+
 				$this->fetchAllCurrencyRate();
 				$this->getRate();
 			}
@@ -234,7 +234,7 @@ class MultiCurrency extends CommonObject
 		$sql.= ' FROM ' . MAIN_DB_PREFIX . $this->table_element_line. ' as cr';
 		$sql.= ' WHERE cr.fk_multicurrency = '.$this->id;
 		$sql.= ' ORDER BY cr.date_sync DESC';
-		
+
 		$this->rates = array();
 
 		dol_syslog(__METHOD__,LOG_DEBUG);
@@ -245,7 +245,7 @@ class MultiCurrency extends CommonObject
 			while ($obj = $this->db->fetch_object($resql)) {
 				$rate = new CurrencyRate($this->db);
 				$rate->fetch($obj->rowid);
-				
+
 				$this->rates[] = $rate;
 			}
 			$this->db->free($resql);
@@ -272,19 +272,19 @@ class MultiCurrency extends CommonObject
 		$error = 0;
 
 		dol_syslog('Currency::update', LOG_DEBUG);
-		
+
 		// Clean parameters
 		$this->name = trim($this->name);
 		$this->code = trim($this->code);
-		
+
 		// Check parameters
 		if (empty($this->code)) {
 			$error++;
 			dol_syslog('Currency::update $this->code can not be empty', LOG_ERR);
-			
+
 			return -1;
 		}
-		
+
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		$sql .= ' name=\''.$this->db->escape($this->name).'\'';
@@ -328,7 +328,7 @@ class MultiCurrency extends CommonObject
 	public function delete($trigger = true)
 	{
 		global $user;
-		
+
 		dol_syslog('Currency::delete', LOG_DEBUG);
 
 		$error = 0;
@@ -347,7 +347,7 @@ class MultiCurrency extends CommonObject
 				$this->errors[] = 'Error ' . $this->db->lasterror();
 				dol_syslog('Currency::delete  ' . join(',', $this->errors), LOG_ERR);
 			}
-			
+
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
 
@@ -371,7 +371,7 @@ class MultiCurrency extends CommonObject
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete rates in database
 	 *
@@ -386,137 +386,137 @@ class MultiCurrency extends CommonObject
 				return false;
 			}
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
-	 * Delete rate in database 
+	 * Delete rate in database
-	 * 
+	 *
 	 * @param double	$rate	rate value
-	 * 
+	 *
 	 * @return int -1 if KO, 1 if OK
 	 */
-	 public function addRate($rate)
+	public function addRate($rate)
-	 {
+	{
 	 	$currencyRate = new CurrencyRate($this->db);
 		$currencyRate->rate = $rate;
-		
+
-		if ($currencyRate->create($this->id) > 0) 
+		if ($currencyRate->create($this->id) > 0)
 		{
 			$this->rate = $currencyRate;
 			return 1;
 		}
-		else 
+		else
 		{
 			$this->rate = null;
 			return -1;
 		}
-	 }
+	}
-	 
+
-	 /**
+	/**
-	  * Try get label of code in llx_currency then add rate
+	 * Try get label of code in llx_currency then add rate
-	  * 
+	 *
-	  * @param	string	$code	currency code
+	 * @param	string	$code	currency code
-	  * @param	double	$rate	new rate
+	 * @param	double	$rate	new rate
-	  * 
+	 *
-	  * @return int -1 if KO, 1 if OK, 2 if label found and OK
+	 * @return int -1 if KO, 1 if OK, 2 if label found and OK
-	  */
+	 */
 	function addRateFromDolibarr($code, $rate)
 	{
 	 	global $db, $user;
-		
+
 		$currency = new MultiCurrency($db);
 		$currency->code = $code;
 		$currency->name = $code;
-		
+
 	 	$sql = 'SELECT label FROM '.MAIN_DB_PREFIX.'c_currencies WHERE code_iso = \''.$db->escape($code).'\'';
-	 	
+
 	 	dol_syslog(__METHOD__,LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql && ($line = $db->fetch_object($resql)))
 		{
 			$currency->name = $line->label;
 		}
-		
+
 		if ($currency->create($user) > 0)
 		{
 			$currency->addRate($rate);
-			
+
 			if (!empty($line)) return 2;
 			else return 1;
 		}
-		
+
-		return -1;	
+		return -1;
 	}
-	 
+
-	 /**
+	/**
 	 * Add new entry into llx_multicurrency_rate to historise
-	 * 
+	 *
 	 * @param double	$rate	rate value
-	  * 
+	  *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	 public function updateRate($rate)
+	public function updateRate($rate)
-	 {
+	{
 	 	return $this->addRate($rate);
-	 }
+	}
-	
+
 	/**
-	 * Fetch CurrencyRate object in $this->rate 
+	 * Fetch CurrencyRate object in $this->rate
-	 * 
+	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	 public function getRate()
+	public function getRate()
-	 {
+	{
 	 	$sql = 'SELECT cr.rowid';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
 		$sql.= ' WHERE cr.fk_multicurrency = '.$this->id;
 		$sql.= ' AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr2.fk_multicurrency = '.$this->id.')';
-		
+
 		dol_syslog(__METHOD__,LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql && ($obj = $this->db->fetch_object($resql))) {
 			$this->rate = new CurrencyRate($this->db);
 			return $this->rate->fetch($obj->rowid);
 		}
-		
+
-	 }
+	}
-	 
+
-	 /**
+	/**
-	 * Get id of currency from code 
+	 * Get id of currency from code
 	 *
 	 * @param DoliDB	$db		object db
 	 * @param string	$code	code value search
-	 * 
+	 *
 	 * @return 0 if not found, >0 if OK
 	 */
-	 public static function getIdFromCode(&$db, $code)
+	public static function getIdFromCode(&$db, $code)
-	 {
+	{
 	 	global $conf;
-		
+
 	 	$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = \''.$db->escape($code).'\' AND entity = '.$conf->entity;
-	 	
+
 	 	dol_syslog(__METHOD__,LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid;
 		else return 0;
-	 }
+	}
-	 
+
-	 /**
+	/**
-	 * Get id and rate of currency from code 
+	 * Get id and rate of currency from code
-	 * 
+	 *
 	 * @param DoliDB	$db		object db
 	 * @param string	$code	code value search
 	 * @param date		$date_document	date from document (propal, order, invoice, ...)
-	 * 
+	 *
 	 * @return 	array	[0] => id currency
 	 *					[1] => rate
 	 */
-	 public static function getIdAndTxFromCode(&$db, $code, $date_document='')
+	public static function getIdAndTxFromCode(&$db, $code, $date_document='')
-	 {
+	{
 		global $conf;
-		
+
 	 	$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
 		$sql1.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
 		$sql1.= ' WHERE m.code = \''.$db->escape($code).'\'';
@@ -524,10 +524,10 @@ class MultiCurrency extends CommonObject
 		$sql2= '';
 		if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE) && !empty($date_document)) $sql2.= ' AND DATE_FORMAT(mc.date_sync, "%Y-%m-%d") = "'.date('Y-m-d', $date_document).'"';
 		$sql3.= ' ORDER BY mc.date_sync DESC LIMIT 1';
-		
+
 		dol_syslog(__METHOD__,LOG_DEBUG);
 		$resql = $db->query($sql1.$sql2.$sql3);
-		
+
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
 		else
 		{
@@ -536,67 +536,68 @@ class MultiCurrency extends CommonObject
 				$resql = $db->query($sql1.$sql3);
 				if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
 			}
-			
+
 			return array(0, 1);
 		}
-	 }  
+	}
-	 
+
-	 /**
+	/**
-	  * Get the conversion of amount with invoice rate
+	 * Get the conversion of amount with invoice rate
-	  * 
+	 *
-	  * @param	int		$fk_facture		id of facture
+	 * @param	int		$fk_facture		id of facture
-	  * @param	double	$amount			amount to convert
+	 * @param	double	$amount			amount to convert
-	  * @param	string	$way			dolibarr mean the amount is in dolibarr currency
+	 * @param	string	$way			dolibarr mean the amount is in dolibarr currency
-	  * @param	string	$table			facture or facture_fourn
+	 * @param	string	$table			facture or facture_fourn
-	  * 
+	 *
-	  * @return	double					amount converted
+	 * @return	double					amount converted
-	  */
+	 */
-	  public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way='dolibarr', $table='facture')
+	public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way='dolibarr', $table='facture')
-	  {
+	{
-		 global $db;
+		global $db;
-		 
+
-		 $multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
+		$multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
-		 
+
-		 if ($multicurrency_tx) 
+		if ($multicurrency_tx)
-		 {
+		{
 		 	if ($way == 'dolibarr') return $amount * $multicurrency_tx;
 			else return $amount / $multicurrency_tx;
-		 }
+		}
-		 else return $amount;
+		else return $amount;
-	  }
+	}
-	  
+
-	  /**
+	/**
-	   *  Get current invoite rate
+	 *  Get current invoite rate
-	   * 
+	 *
-	   *  @param	int 	$fk_facture 	id of facture
+	 *  @param	int 	$fk_facture 	id of facture
-	   *  @param 	string 	$table 			facture or facture_fourn
+	 *  @param 	string 	$table 			facture or facture_fourn
-	   */
+     *  @return bool
-	   public static function getInvoiceRate($fk_facture, $table='facture')
+	 */
-	   {
+	public static function getInvoiceRate($fk_facture, $table='facture')
-		 global $db;
+	{
-		 
+		global $db;
-		 $sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
+
-		 
+		$sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
-		 dol_syslog(__METHOD__,LOG_DEBUG);
+
-		 $resql = $db->query($sql);
+		dol_syslog(__METHOD__,LOG_DEBUG);
-		 if ($resql && ($line = $db->fetch_object($resql)))
+		$resql = $db->query($sql);
-		 {
+		if ($resql && ($line = $db->fetch_object($resql)))
+		{
 		 	return $line->multicurrency_tx;
-		 }
+		}
-		 
+
-		 return false;
+		return false;
-	   }
+	}
 
 	/**
 	 * With free account we can't set source then recalcul all rates to force another source
-	 * 
+	 *
-	 * @param	stdClass	$TRate	Object containing all currencies rates	
+	 * @param	stdClass	$TRate	Object containing all currencies rates
 	 * @return	-1 if KO, 0 if nothing, 1 if OK
 	 */
 	public static function  recalculRates(&$TRate)
 	{
 		global $conf;
-		
+
 		if (!empty($conf->global->MULTICURRENCY_ALTERNATE_SOURCE))
 		{
 			$alternate_source = 'USD'.$conf->global->MULTICURRENCY_ALTERNATE_SOURCE;
@@ -607,38 +608,39 @@ class MultiCurrency extends CommonObject
 				{
 					$rate *= $coef;
 				}
-				
+
 				return 1;
 			}
-			
+
 			return -1; // Alternate souce not found
 		}
-		
+
 		return 0; // Nothing to do
 	}
-	
+
 	/**
 	 *  Sync rates from api
-	 * 
+	 *
 	 *  @param 	array 	$response 	array of reponse from api to sync dolibarr rates
+     * @return void
 	 */
 	public static function syncRates($response)
 	{
 		global $db,$conf;
-		
-		$ch = curl_init('http://apilayer.net/api/live?access_key='.$key.'');
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                $response = curl_exec($ch);
-                curl_close($ch);
-                $response = json_decode($response);
 
-                if ($response->success)
+		$ch = curl_init('http://apilayer.net/api/live?access_key='.$key.'');
-                {
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		
+        $response = curl_exec($ch);
+        curl_close($ch);
+        $response = json_decode($response);
+
+        if ($response->success)
+        {
+
 			$TRate = $response->quotes;
 			$timestamp = $response->timestamp;
 
-			if (self::recalculRates($TRate) >= 0) 
+			if (self::recalculRates($TRate) >= 0)
 			{
 				foreach ($TRate as $currency_code => $rate)
 				{
@@ -648,11 +650,11 @@ class MultiCurrency extends CommonObject
 					{
 						$obj->updateRate($rate);
 					}
-					else 
+					else
 					{
 						self::addRateFromDolibarr($code, $rate);
 					}
-				}	
+				}
 			}
 		}
 		else
@@ -660,21 +662,21 @@ class MultiCurrency extends CommonObject
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
 		}
 	}
-	
+
 	/**
 	 * Check in database if the current code already exists
-	 * 
+	 *
 	 * @param	string	$code 	current code to search
 	 * @return	boolean         True if exists, false if not exists
 	 */
-	 public static function checkCodeAlreadyExists($code)
+	public static function checkCodeAlreadyExists($code)
-	 {
+	{
 	 	global $db;
-		
+
 	 	$currency = new MultiCurrency($db);
 		if ($currency->fetch('', $code) > 0) return true;
 		else return false;
-	 }
+	}
 }
 
 /**
@@ -710,7 +712,7 @@ class CurrencyRate extends CommonObjectLine
 	 * @var int Id of entity
 	 */
 	public $entity;
-	
+
 	/**
 	 * Constructor
 	 *
@@ -719,10 +721,10 @@ class CurrencyRate extends CommonObjectLine
 	public function __construct(DoliDB $db)
 	{
 		$this->db = &$db;
-		
+
 		return 1;
 	}
-	
+
 	/**
 	 * Create object into database
 	 *
@@ -734,14 +736,14 @@ class CurrencyRate extends CommonObjectLine
 	public function create($fk_multicurrency, $trigger = true)
 	{
 		global $conf, $user;
-		
+
 		dol_syslog('CurrencyRate::create', LOG_DEBUG);
 
 		$error = 0;
 		$this->rate = price2num($this->rate);
 		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
 		$now=date('Y-m-d H:i:s');
-		
+
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		$sql .= ' rate,';
@@ -769,7 +771,7 @@ class CurrencyRate extends CommonObjectLine
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 			$this->fk_multicurrency = $fk_multicurrency;
 			$this->date_sync = $now;
-			
+
 			if ($trigger) {
 				$result=$this->call_trigger('CURRENCYRATE_CREATE', $user);
 				if ($result < 0) $error++;
@@ -829,7 +831,7 @@ class CurrencyRate extends CommonObjectLine
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Update object into database
 	 *
@@ -840,13 +842,13 @@ class CurrencyRate extends CommonObjectLine
 	public function update($trigger = true)
 	{
 		global $user;
-		
+
 		$error = 0;
 
 		dol_syslog('CurrencyRate::update', LOG_DEBUG);
-		
+
 		$this->rate = price2num($this->rate);
-		
+
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		$sql .= ' rate='.$this->rate;
@@ -878,7 +880,7 @@ class CurrencyRate extends CommonObjectLine
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete object in database
 	 *
@@ -889,7 +891,7 @@ class CurrencyRate extends CommonObjectLine
 	public function delete($trigger = true)
 	{
 		global $user;
-		
+
 		dol_syslog('CurrencyRate::delete', LOG_DEBUG);
 
 		$error = 0;
@@ -925,5 +927,5 @@ class CurrencyRate extends CommonObjectLine
 			return 1;
 		}
 	}
-	
+
 }

htdocs/opensurvey/card.php

@@ -430,6 +430,6 @@ if ($object->allow_comments) {
 
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/index.php

@@ -78,8 +78,6 @@ print '</table>';
 
 print '</div></div></div>';
 
-
+// End of page
-
 llxFooter();
-
 $db->close();

htdocs/opensurvey/list.php

@@ -296,6 +296,6 @@ print '</table>'."\n";
 print '</div>';
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/wizard/choix_autre.php

@@ -161,6 +161,6 @@ print '<a name=bas></a>'."\n";
 print '<br><br><br>'."\n";
 print '</div>'."\n";
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/wizard/choix_date.php

@@ -564,6 +564,6 @@ print '</form>'."\n";
 print '<br><br><br><br>'."\n";
 print '</div></div>'."\n";
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/wizard/create_survey.php

@@ -204,6 +204,6 @@ else
 print '<br><br><br>'."\n";
 print '</form>'."\n";
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/wizard/index.php

@@ -57,6 +57,6 @@ print '<div style="clear:both;"></div>';
 print '</div>';
 print '</div></form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/paybox/admin/paybox.php

@@ -250,5 +250,6 @@ print '<br><br>';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/paypal/admin/paypal.php

@@ -326,5 +326,6 @@ $token='';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/printing/admin/printing.php

@@ -361,6 +361,6 @@ if ($mode == 'userconf' && $user->admin)
 
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/printing/index.php

@@ -68,6 +68,6 @@ foreach ($result as $driver)
     }
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/dynamic_prices.php

@@ -357,5 +357,6 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
     print '</form>';
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/admin/price_rules.php

@@ -200,6 +200,6 @@ print '<div style="text-align: center">
 	
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/product.php

@@ -744,7 +744,7 @@ print '</table>';
 
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
 

htdocs/product/admin/product_extrafields.php

@@ -126,6 +126,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/product_lot_extrafields.php

@@ -116,6 +116,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/product_tools.php

@@ -342,6 +342,6 @@ else
 	print '</form>';
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/agenda.php

@@ -203,7 +203,6 @@ if ($id > 0 || $ref)
     }
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/card.php

@@ -2187,6 +2187,6 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete')
     print '</div></div></div>';
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/class/product.class.php

@@ -4549,6 +4549,7 @@ class Product extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
+     * @return void
 	 */
 	public function setCategories($categories) {
 		// Handle single category

htdocs/product/composition/card.php

@@ -657,7 +657,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/document.php

@@ -345,6 +345,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/dynamic_price/editor.php

@@ -244,5 +244,6 @@ print '<script type="text/javascript">
 	}
 </script>';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/fournisseurs.php

@@ -889,7 +889,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/index.php

@@ -397,8 +397,8 @@ if (! empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM))
 
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
 
 

htdocs/product/inventory/card.php

@@ -409,7 +409,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	*/
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/list.php

@@ -960,6 +960,6 @@ else
 	dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/note.php

@@ -115,6 +115,7 @@ if ($id > 0 || ! empty($ref))
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
 

htdocs/product/popuprop.php

@@ -207,6 +207,6 @@ print "</table>";
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/price.php

@@ -2197,6 +2197,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/reassort.php

@@ -391,6 +391,6 @@ else
 	dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/reassortlot.php

@@ -421,6 +421,6 @@ else
 	dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/card.php

@@ -433,6 +433,6 @@ if (! $id)
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stats/commande.php

@@ -257,5 +257,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/commande_fournisseur.php

@@ -265,5 +265,6 @@ if ($id > 0 || ! empty($ref)) {
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/contrat.php

@@ -236,6 +236,6 @@ else
 	dol_print_error();
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/facture.php

@@ -278,5 +278,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/facture_fournisseur.php

@@ -263,5 +263,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/propal.php

@@ -261,5 +261,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/supplier_proposal.php

@@ -260,5 +260,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stock/card.php

@@ -707,7 +707,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	}
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/fiche-valo.php

@@ -140,5 +140,6 @@ if ($_GET["id"])
 	print "</div>";
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stock/index.php

@@ -185,6 +185,6 @@ if ($resql)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/info.php

@@ -73,6 +73,6 @@ dol_print_object_info($object);
 
 print '</div>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/list.php

@@ -271,7 +271,6 @@ else
   dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/massstockmove.php

@@ -462,7 +462,6 @@ print '<div class="center"><input class="button" type="submit" name="valid" valu
 
 print '</form>';
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/mouvement.php

@@ -1173,7 +1173,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id>0)
 }
 */
 
+// End of page
 llxFooter();
-
 $db->close();
 

htdocs/product/stock/product.php

@@ -994,6 +994,6 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/productlot_card.php

@@ -416,7 +416,6 @@ if (empty($action))
 
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/stock/productlot_list.php

@@ -551,7 +551,6 @@ else
 	dol_print_error($db);
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/stock/replenishorders.php

@@ -336,5 +336,6 @@ else
 	dol_print_error($db);
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stock/valo.php

@@ -157,7 +157,6 @@ else
     dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/traduction.php

@@ -354,5 +354,6 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<br>';
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/activity/index.php

@@ -576,7 +576,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
 
 print '</div></div></div>';
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/activity/perday.php

@@ -710,6 +710,6 @@ if ($conf->use_javascript_ajax)
 	print '</script>';
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/activity/perweek.php

@@ -749,7 +749,6 @@ if ($conf->use_javascript_ajax)
 	print '</script>';
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/admin/project.php

@@ -910,5 +910,6 @@ print '</table>';
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/admin/project_extrafields.php

@@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();