Merge remote-tracking branch 'upstream/develop' into patch-6

htdocs/adherents/admin/adherent.php

@@ -33,8 +33,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("admin","members"));
 
 if (! $user->admin) accessforbidden();
 

htdocs/adherents/admin/adherent_emails.php

@@ -33,8 +33,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("admin","members"));
 
 if (! $user->admin) accessforbidden();
 

htdocs/adherents/admin/adherent_extrafields.php

@@ -28,8 +28,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin","members"));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/adherents/admin/adherent_type_extrafields.php

@@ -31,8 +31,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin","members"));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);

htdocs/adherents/admin/website.php

@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin","members"));
 
 $action=GETPOST('action', 'alpha');
 

htdocs/adherents/agenda.php

@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members"));
 
 $id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');
 

htdocs/adherents/document.php

@@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array("companies","members","other"));
-$langs->load('other');
+
 
 $id=GETPOST('id','int');
 $action=GETPOST('action','alpha');

htdocs/adherents/index.php

@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members"));
 
 // Security check
 $result=restrictedArea($user,'adherent');

htdocs/adherents/ldap.php

@@ -29,10 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members","ldap","admin"));
-$langs->load("ldap");
-$langs->load("admin");
 
 $rowid = GETPOST('id','int');
 $action = GETPOST('action','aZ09');

htdocs/adherents/note.php

@@ -28,9 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("members");
+$langs->loadLangs(array("companies","members","bills"));
-$langs->load("bills");
 
 $action=GETPOST('action','alpha');
 $id=GETPOST('id','int');

htdocs/adherents/stats/byproperties.php

@@ -44,8 +44,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/stats/geo.php

@@ -45,8 +45,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/stats/index.php

@@ -46,8 +46,8 @@ $year = strftime("%Y", time());
 $startyear=$year-2;
 $endyear=$year;
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("companies");
+$langs->loadLangs(array("companies","members"));
 
 
 /*

htdocs/adherents/subscription/card.php

@@ -30,10 +30,8 @@ if (! empty($conf->banque->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("bills");
+$langs->loadLangs(array("companies","members","bills","users"));
-$langs->load("members");
-$langs->load("users");
 
 $adh = new Adherent($db);
 $object = new Subscription($db);

htdocs/adherents/subscription/info.php

@@ -28,10 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-$langs->load("companies");
+// Load translation files required by the page
-$langs->load("bills");
+$langs->loadLangs(array("companies","members","bills","users"));
-$langs->load("members");
-$langs->load("users");
 
 if (!$user->rights->adherent->lire)
 	accessforbidden();

htdocs/adherents/type_ldap.php

@@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
-$langs->load("members");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin","members","ldap"));
-$langs->load("ldap");
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action','alpha');

htdocs/admin/company.php

@@ -50,6 +50,7 @@ $error=0;
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admincompany','globaladmin'));
 
+
 /*
  * Actions
  */
@@ -397,7 +398,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
 		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
 			print ' &nbsp; ';
-			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
 		}
 	} else {
 		print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
@@ -791,7 +792,7 @@ else
 	}
 	else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 	{
-		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
 	}
 	else
 	{

htdocs/admin/ihm.php

@@ -413,7 +413,7 @@ if ($action == 'edit')	// Edit
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
 		if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
 			print ' &nbsp; ';
-			print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
+			print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
 		}
 	} else {
 		print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
@@ -561,7 +561,7 @@ else	// Show
 	print $conf->global->MAIN_LOGIN_BACKGROUND;
 	if ($conf->global->MAIN_LOGIN_BACKGROUND && is_file($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND))
 	{
-		print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'">';
+		print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
 	}
 	else
 	{

htdocs/admin/menus/edit.php

@@ -28,9 +28,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 
-
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("other","admin"));
-$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/menus/index.php

@@ -27,8 +27,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 
-$langs->load("other");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("other","admin"));
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/menus/other.php

@@ -24,9 +24,8 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->load("users");
+// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("user","other","admin"));
-$langs->load("other");
 
 if (! $user->admin) accessforbidden();
 

htdocs/admin/system/about.php

@@ -28,10 +28,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("help");
+$langs->loadLangs(array("help","members","other","admin"));
-$langs->load("members");
-$langs->load("other");
 
 $action=GETPOST('action','alpha');
 

htdocs/admin/system/browser.php

@@ -26,9 +26,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("install");
+$langs->loadLangs(array("install","other","admin"));
-$langs->load("other");
 
 if (! $user->admin)
 	accessforbidden();

htdocs/admin/system/constall.php

@@ -24,9 +24,8 @@
 
 require '../../main.inc.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("user");
+$langs->loadLangs(array("install","user","admin"));
-$langs->load("install");
 
 
 if (!$user->admin)

htdocs/admin/system/dolibarr.php

@@ -29,9 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("install");
+$langs->loadLangs(array("install","other","admin"));
-$langs->load("other");
 
 $action=GETPOST('action','alpha');
 

htdocs/admin/system/modules.php

@@ -25,9 +25,8 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("install");
+$langs->loadLangs(array("install","other","admin"));
-$langs->load("other");
 
 if (! $user->admin)
 	accessforbidden();

htdocs/admin/system/perf.php

@@ -26,9 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->load("admin");
+// Load translation files required by the page
-$langs->load("install");
+$langs->loadLangs(array("install","other","admin"));
-$langs->load("other");
 
 if (! $user->admin)
 	accessforbidden();

htdocs/asset/class/asset.class.php

@@ -109,16 +109,16 @@ class Asset extends CommonObject
 	public $entity;
 
 	/**
-     * @var string Asset label
+   * @var string Asset label
-     */
+   */
-   	public $label;
+  public $label;
 
 	public $amount;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	/**
 	 * @var string description

htdocs/bookmarks/class/bookmark.class.php

@@ -29,9 +29,9 @@
 class Bookmark extends CommonObject
 {
     /**
-	 * @var string ID to identify managed object
+	   * @var string ID to identify managed object
-	 */
+	   */
-	public $element='bookmark';
+	  public $element='bookmark';
 
     /**
      * @var string Name of table without prefix where object is stored
@@ -41,9 +41,9 @@ class Bookmark extends CommonObject
     public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto = 'bookmark';
+	  public $picto = 'bookmark';
 
     /**
      * @var DoliDB Database handler.
@@ -56,9 +56,9 @@ class Bookmark extends CommonObject
     public $id;
 
     /**
-	 * @var int User ID
+	   * @var int User ID
-	 */
+	   */
-	public $fk_user;
+	  public $fk_user;
 
     public $datec;
     public $url;

htdocs/cashdesk/index.php

@@ -63,7 +63,7 @@ top_htmlhead('','',0,0,'',$arrayofcss);
 <?php
 if (! empty($mysoc->logo_small))
 {
-    print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">';
+    print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 }
 else
 {

htdocs/cashdesk/tpl/ticket.tpl.php

@@ -47,7 +47,7 @@ $object->fetch($facid);
 
 <div class="entete">
     <div class="logo">
-        <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
+        <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">'; ?>
     </div>
     <div class="infos">
         <p class="address"><?php echo $mysoc->name; ?><br>

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

@@ -47,9 +47,9 @@ class ActionComm extends CommonObject
     public $table_rowid = 'id';
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto='action';
+	  public $picto='action';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -67,7 +67,7 @@ class ActionComm extends CommonObject
      * Id of the event
      * @var int
      */
-	public $id;
+	  public $id;
 
     /**
      * Id of the event. Use $id as possible

htdocs/comm/action/class/cactioncomm.class.php

@@ -56,9 +56,9 @@ class CActionComm
     public $color;
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	   * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
+	   */
-	public $picto;
+	  public $picto;
 
     public $type_actions=array();
 

htdocs/commande/class/commande.class.php

@@ -64,6 +64,9 @@ class Commande extends CommonOrder
 	 */
 	public $fk_element = 'fk_commande';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'order';
 
 	/**

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

@@ -46,6 +46,9 @@ class Account extends CommonObject
 	 */
 	public $table_element = 'bank_account';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'account';
 
 	/**
@@ -1664,6 +1667,9 @@ class AccountLine extends CommonObject
 	 */
 	public $table_element='bank';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'generic';
 
 	/**

htdocs/compta/bank/class/bankcateg.class.php

@@ -30,7 +30,10 @@ class BankCateg // extends CommonObject
 {
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
-    public $picto='generic';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='generic';
 
 	/**
      * @var int ID

htdocs/compta/bank/class/paymentvarious.class.php

@@ -40,6 +40,9 @@ class PaymentVarious extends CommonObject
 	 */
 	public $table_element='payment_various';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'bill';
 
 	/**
@@ -82,7 +85,6 @@ class PaymentVarious extends CommonObject
 		$this->db = $db;
 		$this->element = 'payment_various';
 		$this->table_element = 'payment_various';
-		return 1;
 	}
 
 	/**
@@ -384,13 +386,14 @@ class PaymentVarious extends CommonObject
 
 					// Insert payment into llx_bank
 					// Add link 'payment_various' in bank_url between payment and bank transaction
-					if ($this->sens == '0') $sign='-';
+					$sign=1;
+					if ($this->sens == '0') $sign=-1;
 
 					$bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,
-						$sign.abs($this->amount),
+						$sign * abs($this->amount),
 						$this->num_payment,
 						'',
 						$user
@@ -540,11 +543,13 @@ class PaymentVarious extends CommonObject
 	/**
 	 *	Send name clicable (with possibly the picto)
 	 *
-	 *	@param  int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param  int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-	 *	@param  string	$option			link option
+	 *	@param  string	$option						link option
-	 *	@return string					Chaine with URL
+	 *  @param  int     $save_lastsearch_value	 	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *	@return string								String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0, $option='', $save_lastsearch_value=-1, $notooltip=0)
 	{
 		global $langs;
 
@@ -555,8 +560,8 @@ class PaymentVarious extends CommonObject
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= ($maxlen?dol_trunc($this->ref,$maxlen):$this->ref);
+		if ($withpicto != 2) $result.= $this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '');
 		$result .= $linkend;
 
 		return $result;

htdocs/compta/facture/class/facture-rec.class.php

@@ -59,6 +59,9 @@ class FactureRec extends CommonInvoice
 	 */
 	public $fk_element='fk_facture';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='bill';
 
 	public $entity;

htdocs/compta/facture/class/facture.class.php

@@ -73,6 +73,9 @@ class Facture extends CommonInvoice
 	 */
 	public $fk_element = 'fk_facture';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='bill';
 
 	/**

htdocs/compta/localtax/class/localtax.class.php

@@ -39,22 +39,25 @@ class Localtax extends CommonObject
 	 */
 	public $table_element='localtax';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
-	var $ltt;
+	public $ltt;
-	var $tms;
+	public $tms;
-	var $datep;
+	public $datep;
-	var $datev;
+	public $datev;
-	var $amount;
+	public $amount;
 
 	/**
      * @var string local tax
      */
     public $label;
 
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
 
     /**
 	 *	Constructor

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -43,12 +43,15 @@ class RemiseCheque extends CommonObject
 	 */
 	public $table_element='bordereau_cheque';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $num;
+	public $num;
-	var $intitule;
+	public $intitule;
 	//! Numero d'erreur Plage 1024-1279
-	var $errno;
+	public $errno;
 
 	public $amount;
 	public $date_bordereau;

htdocs/compta/paiement/class/paiement.class.php

@@ -46,34 +46,40 @@ class Paiement extends CommonObject
 	 */
 	public $table_element='paiement';
 
-    public $picto = 'payment';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
+
+	public $facid;
+	public $datepaye;
 
-	var $facid;
-	var $datepaye;
 	/**
 	 * @deprecated
 	 * @see amount, amounts
 	 */
-    var $total;
+    public $total;
+
 	/**
 	 * @deprecated
 	 * @see amount, amounts
 	 */
-	var $montant;
+	public $montant;
-	var $amount;            // Total amount of payment
+
-	var $amounts=array();   // Array of amounts
+	public $amount;            // Total amount of payment
-	var $multicurrency_amounts=array();   // Array of amounts
+	public $amounts=array();   // Array of amounts
-	var $author;
+	public $multicurrency_amounts=array();   // Array of amounts
-	var $paiementid;	// Type de paiement. Stocke dans fk_paiement
+	public $author;
+	public $paiementid;	// Type de paiement. Stocke dans fk_paiement
 	// de llx_paiement qui est lie aux types de
 	//paiement de llx_c_paiement
-	var $num_paiement;	// Numero du CHQ, VIR, etc...
+	public $num_paiement;	// Numero du CHQ, VIR, etc...
-	var $num_payment;	// Numero du CHQ, VIR, etc...
+	public $num_payment;	// Numero du CHQ, VIR, etc...
-	var $bank_account;	// Id compte bancaire du paiement
+	public $bank_account;	// Id compte bancaire du paiement
-	var $bank_line;     // Id de la ligne d'ecriture bancaire
+	public $bank_line;     // Id de la ligne d'ecriture bancaire
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
-    var $fk_paiement;    // Type of paiment
+    public $fk_paiement;    // Type of paiment
 
 
 	/**

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -49,27 +49,30 @@ class BonPrelevement extends CommonObject
 	 */
 	public $table_element='prelevement_bons';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
-	var $date_echeance;
+	public $date_echeance;
-	var $raison_sociale;
+	public $raison_sociale;
-	var $reference_remise;
+	public $reference_remise;
-	var $emetteur_code_guichet;
+	public $emetteur_code_guichet;
-	var $emetteur_numero_compte;
+	public $emetteur_numero_compte;
-	var $emetteur_code_banque;
+	public $emetteur_code_banque;
-	var $emetteur_number_key;
+	public $emetteur_number_key;
 
-	var $emetteur_iban;
+	public $emetteur_iban;
-	var $emetteur_bic;
+	public $emetteur_bic;
-	var $emetteur_ics;
+	public $emetteur_ics;
 
-	var $total;
+	public $total;
-	var $_fetched;
+	public $fetched;
-	var $statut;    // 0-Wait, 1-Trans, 2-Done
+	public $statut;    // 0-Wait, 1-Trans, 2-Done
-	var $labelstatut=array();
+	public $labelstatut=array();
 
-	var $invoice_in_error=array();
+	public $invoice_in_error=array();
-	var $thirdparty_in_error=array();
+	public $thirdparty_in_error=array();
 
 
 	/**
@@ -106,7 +109,7 @@ class BonPrelevement extends CommonObject
 
 		$this->methodes_trans[0] = "Internet";
 
-		$this->_fetched = 0;
+		$this->fetched = 0;
 	}
 
 	/**
@@ -312,7 +315,7 @@ class BonPrelevement extends CommonObject
 
 				$this->statut             = $obj->statut;
 
-				$this->_fetched = 1;
+				$this->fetched = 1;
 
 				return 1;
 			}
@@ -420,7 +423,7 @@ class BonPrelevement extends CommonObject
 
 		$error = 0;
 
-		if ($this->_fetched == 1)
+		if ($this->fetched == 1)
 		{
 			if ($date >= $this->date_trans)
 			{

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -41,6 +41,9 @@ class PaymentSalary extends CommonObject
 	 */
 	public $table_element='payment_salary';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
 	public $tms;

htdocs/compta/sociales/class/chargesociales.class.php

@@ -44,25 +44,28 @@ class ChargeSociales extends CommonObject
 	 */
 	public $table_element='chargesociales';
 
-    public $picto = 'bill';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'bill';
 
     /**
      * {@inheritdoc}
      */
     protected $table_ref_field = 'ref';
 
-    var $date_ech;
+    public $date_ech;
-    var $lib;
+    public $lib;
-    var $type;
+    public $type;
-    var $type_libelle;
+    public $type_libelle;
-    var $amount;
+    public $amount;
-    var $paye;
+    public $paye;
-    var $periode;
+    public $periode;
-    var $date_creation;
+    public $date_creation;
-    var $date_modification;
+    public $date_modification;
-    var $date_validation;
+    public $date_validation;
-    var $fk_account;
+    public $fk_account;
-	var $fk_project;
+	public $fk_project;
 
 
     /**

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -41,17 +41,22 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $table_element='paiementcharge';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'payment';
 
 	public $fk_charge;
 	public $datec='';
 	public $tms='';
 	public $datep='';
+
 	/**
 	 * @deprecated
 	 * @see amount
 	 */
 	public $total;
+
     public $amount;            // Total amount of payment
     public $amounts=array();   // Array of amounts
 	public $fk_typepaiement;

htdocs/compta/tva/class/tva.class.php

@@ -43,23 +43,26 @@ class Tva extends CommonObject
 	 */
 	public $table_element='tva';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto='payment';
 
-	var $tms;
+	public $tms;
-	var $datep;
+	public $datep;
-	var $datev;
+	public $datev;
-	var $amount;
+	public $amount;
-	var $type_payment;
+	public $type_payment;
-	var $num_payment;
+	public $num_payment;
 
 	/**
      * @var string label
      */
     public $label;
 
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
 
     /**
 	 *	Constructor

htdocs/contact/class/contact.class.php

@@ -48,6 +48,10 @@ class Contact extends CommonObject
 	public $table_element='socpeople';
 
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'contact';
 
 

htdocs/contrat/class/contrat.class.php

@@ -61,7 +61,10 @@ class Contrat extends CommonObject
 	 */
 	public $fk_element='fk_contrat';
 
-    public $picto='contract';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto='contract';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

htdocs/core/class/discount.class.php

@@ -34,9 +34,9 @@ class DiscountAbsolute
     public $db;
 
     /**
-	 * @var string Error code (or message)
+	   * @var string Error code (or message)
-	 */
+	   */
-	public $error;
+	  public $error;
 
 	/**
 	 * @var string[]	Array of error strings
@@ -48,9 +48,9 @@ class DiscountAbsolute
 	 */
 	public $id;
 
-    /**
+   /**
-	 * @var int Thirdparty ID
+	  * @var int Thirdparty ID
-	 */
+	  */
     public $fk_soc;
 
     public $discount_type;			// 0 => customer discount, 1 => supplier discount
@@ -60,14 +60,14 @@ class DiscountAbsolute
     public $tva_tx;				// Vat rate
 
     /**
-	 * @var int User ID Id utilisateur qui accorde la remise
+	   * @var int User ID Id utilisateur qui accorde la remise
-	 */
+	   */
-	public $fk_user;
+	  public $fk_user;
 
     /**
-	 * @var string description
+	   * @var string description
-	 */
+	   */
-	public $description;
+	  public $description;
 
     public $datec;					// Date creation
     public $fk_facture_line;  		// Id invoice line when a discount is used into an invoice line (for absolute discounts)

htdocs/core/lib/company.lib.php

@@ -1485,10 +1485,10 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
     {
         $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
         $formactions=new FormActions($db);
 

htdocs/core/lib/files.lib.php

@@ -1268,7 +1268,7 @@ function dol_delete_dir($dir,$nophperrors=0)
  *  @param  int		$nophperrors    Disable all PHP output errors
  *  @param	int		$onlysub		Delete only files and subdir, not main directory
  *  @param  int		$countdeleted   Counter to count nb of elements found really deleted
- *  @return int             		Number of files and directory we try to remove. NB really removed is returned into $countdeleted.
+ *  @return int             		Number of files and directory we try to remove. NB really removed is returned into var by reference $countdeleted.
  */
 function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
 {
@@ -2161,10 +2161,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$dirins.'/'.$original_file;
 	}
 	// Wrapping for some images
-	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
+	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
+		$original_file=$conf->mycompany->dir_output.'/'.$original_file;
 	}
 	// Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))

htdocs/core/lib/pdf.lib.php

@@ -451,7 +451,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
 				// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
 				if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
 				{
-						$targetcontact->fetch_thirparty();
+						$targetcontact->fetch_thirdparty();
 						$companytouseforaddress = $targetcontact->thirdparty;
 					}
 

htdocs/core/lib/security.lib.php

@@ -662,6 +662,7 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess
     {
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
         $langs=new Translate('',$conf);
+        $langs->setDefaultLang();
     }
 
     $langs->load("errors");

htdocs/core/lib/security2.lib.php

@@ -228,11 +228,11 @@ if (! function_exists('dol_loginfunction'))
 
 		if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
 		}
 		elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
 			$width=128;
 		}
 		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))

htdocs/core/lib/ticket.lib.php

@@ -160,9 +160,9 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	$urllogo = DOL_URL_ROOT . '/theme/login_logo.png';
 
     	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode('thumbs/' . $mysoc->logo_small);
+    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
     	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode($mysoc->logo);
+    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode('logos/'.$mysoc->logo);
     		$width = 128;
     	} elseif (is_readable(DOL_DOCUMENT_ROOT . '/theme/dolibarr_logo.png')) {
     		$urllogo = DOL_URL_ROOT . '/theme/dolibarr_logo.png';

htdocs/core/lib/website.lib.php

@@ -150,9 +150,11 @@ function dolWebsiteOutput($content)
 		$nbrep=0;
 		if (! $symlinktomediaexists)
 		{
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\document.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
 		}
 		else
 		{

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

@@ -273,7 +273,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_mini);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		}
 		else
 		{

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

@@ -469,7 +469,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_mini);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		}
 		else
 		{

htdocs/core/tpl/login.tpl.php

@@ -19,6 +19,7 @@
 // Need global variable $title to be defined by caller (like dol_loginfunction)
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
 
+
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
@@ -27,6 +28,8 @@ if (empty($conf) || ! is_object($conf))
 }
 
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
@@ -55,10 +58,16 @@ if (! preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenof
 
 print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);
 
+
+$colorbackhmenu1='60,70,100';      // topmenu
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1):(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
+
 ?>
 <!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP -->
 
-<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -69,7 +78,7 @@ $(document).ready(function () {
 </script>
 <?php } ?>
 
-<div class="login_center center">
+<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.'), rgb(240,240,240));"':'' ?>>
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">

htdocs/core/tpl/passwordforgotten.tpl.php

@@ -24,6 +24,8 @@ if (empty($conf) || ! is_object($conf))
 }
 
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
@@ -42,10 +44,17 @@ $php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag(
 $titleofpage=$langs->trans('SendNewPassword');
 
 print top_htmlhead('', $titleofpage);
+
+
+$colorbackhmenu1='60,70,100';      // topmenu
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
+
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
-<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -57,7 +66,7 @@ $(document).ready(function () {
 <?php } ?>
 
 
-<div class="login_center center">
+<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.'), rgb(240,240,240));"':'' ?>>
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">

htdocs/core/triggers/interface_20_all_Logevents.class.php

@@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceLogevents extends DolibarrTriggers
 {
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
+
 	public $family = 'core';
 	public $description = "Triggers of this module allows to add security event records inside Dolibarr.";
 	public $version = self::VERSION_DOLIBARR;

htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

@@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
 class InterfaceWorkflowManager extends DolibarrTriggers
 {
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
+
 	public $family = 'core';
 	public $description = "Triggers of this module allows to manage workflows";
 	public $version = self::VERSION_DOLIBARR;

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -37,6 +37,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	public $family = 'agenda';
 	public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'action';
 
 	/**

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

@@ -33,6 +33,10 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	public $family = 'system';
 	public $description = "Triggers of this module add action for BlockedLog module.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php

@@ -34,6 +34,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	public $family = 'ldap';
 	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

@@ -32,6 +32,10 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	public $family = 'mailmanspip';
 	public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'technic';
 
 	/**

htdocs/core/triggers/interface_50_modNotification_Notification.class.php

@@ -33,9 +33,13 @@ class InterfaceNotification extends DolibarrTriggers
 	public $family = 'notification';
 	public $description = "Triggers of this module send email notifications according to Notification module setup.";
 	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * @var string Image of the trigger
+	 */
 	public $picto = 'email';
 
-	var $listofmanagedevents=array(
+	public $listofmanagedevents=array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
 		'ORDER_VALIDATE',

htdocs/cron/class/cronjob.class.php

@@ -40,7 +40,10 @@ class Cronjob extends CommonObject
 	 */
 	public $table_element='cronjob';
 
-    public $picto = 'cron';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'cron';
 
     /**
 	 * @var int Entity

htdocs/document.php

@@ -37,13 +37,6 @@ if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
 
-// For bittorent link, we don't need to load/check we are into a login session
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent')
-{
-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);
-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip
-}
 // For direct external download link, we don't need to load/check we are into a login session
 if (isset($_GET["hashp"]))
 {

htdocs/don/class/don.class.php

@@ -50,7 +50,11 @@ class Don extends CommonObject
 	public $fk_element = 'fk_donation';
 
 	public $ismultientitymanaged = 1;  	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'generic';
+
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'generic';
 
     public $date;
     public $amount;

htdocs/don/class/paymentdonation.class.php

@@ -39,7 +39,10 @@ class PaymentDonation extends CommonObject
 	 */
 	public $table_element='payment_donation';
 
-    public $picto = 'payment';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
 
 	/**
 	 * @var int ID

htdocs/ecm/class/ecmdirectory.class.php

@@ -37,6 +37,9 @@ class EcmDirectory // extends CommonObject
 	 */
 	//public $table_element='ecm_directories';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'dir';
 
 	/**

htdocs/ecm/class/ecmfiles.class.php

@@ -46,6 +46,9 @@ class EcmFiles extends CommonObject
 	 */
 	public $table_element = 'ecm_files';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'generic';
 
 	/**

htdocs/expedition/class/expedition.class.php

@@ -62,6 +62,10 @@ class Expedition extends CommonObject
 	public $table_element_line="expeditiondet";
 
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'sending';
 
 	public $socid;

htdocs/expensereport/class/paymentexpensereport.class.php

@@ -40,24 +40,27 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $table_element='payment_expensereport';
 
-    public $picto = 'payment';
+    /**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
 
-	var $rowid;
+	public $rowid;
 
-	var $fk_expensereport;
+	public $fk_expensereport;
-	var $datec='';
+	public $datec='';
-	var $tms='';
+	public $tms='';
-	var $datep='';
+	public $datep='';
-    var $amount;            // Total amount of payment
+    public $amount;            // Total amount of payment
-    var $amounts=array();   // Array of amounts
+    public $amounts=array();   // Array of amounts
-	var $fk_typepayment;
+	public $fk_typepayment;
-	var $num_payment;
+	public $num_payment;
-	var $fk_bank;
+	public $fk_bank;
-	var $fk_user_creat;
+	public $fk_user_creat;
-	var $fk_user_modif;
+	public $fk_user_modif;
     //Unknow field
-    var $chid;
+    public $chid;
-    var $total;
+    public $total;
 
 	/**
 	 *	Constructor

htdocs/fichinter/class/fichinter.class.php

@@ -55,6 +55,9 @@ class Fichinter extends CommonObject
 	 */
 	public $table_element_line='fichinterdet';
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
 	public $picto = 'intervention';
 
 	/**

htdocs/holiday/class/holiday.class.php

@@ -946,53 +946,53 @@ class Holiday extends CommonObject
 		if ($mode == 0)
 		{
 			if ($statut == 1) return $langs->trans('DraftCP');
-			if ($statut == 2) return $langs->trans('ToReviewCP');
+			elseif ($statut == 2) return $langs->trans('ToReviewCP');
-			if ($statut == 3) return $langs->trans('ApprovedCP');
+			elseif ($statut == 3) return $langs->trans('ApprovedCP');
-			if ($statut == 4) return $langs->trans('CancelCP');
+			elseif ($statut == 4) return $langs->trans('CancelCP');
-			if ($statut == 5) return $langs->trans('RefuseCP');
+			elseif ($statut == 5) return $langs->trans('RefuseCP');
 		}
-		if ($mode == 2)
+		elseif ($mode == 2)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');				// Draft
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
+			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
+			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
+			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
+			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
 		}
-		if ($mode == 3)
+		elseif ($mode == 3)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
-			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
+			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
-			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		if ($mode == 5)
+		elseif ($mode == 5)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
+			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		if ($mode == 6)
+		elseif ($mode == 6)
 		{
 			$pictoapproved='statut6';
 			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
-			if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
+			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1');		// Waiting approval
-			if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
-			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
+			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
-			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
+			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
 
-		return $statut;
+		else return $statut;
 	}
 
 

htdocs/install/step1.php

@@ -485,8 +485,8 @@ if (! $error && $db->connected && $action == "set")
             		'products' => 'product',
             		'projects' => 'project',
             		'proposals' => 'proposal',
-            		'shipment' => 'shipment',
+            		'shipments' => 'shipment',
-            		'supplier_proposal' => 'supplier_proposal',
+            		'supplier_proposals' => 'supplier_proposal',
             		'tasks' => 'task_summary',
             		'thirdparties' => 'thirdparty',
             		'usergroups' => 'usergroups',

htdocs/langs/en_US/website.lang

@@ -18,10 +18,10 @@ HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.   
 MediaFiles=Media library
-EditCss=Edit Style/CSS or HTML header
+EditCss=Edit website properties
 EditMenu=Edit menu
 EditMedias=Edit medias
-EditPageMeta=Edit Meta
+EditPageMeta=Edit page/container properties
 EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
@@ -30,6 +30,7 @@ HomePage=Home Page
 PageContainer=Page/container
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
+SiteDeleted=Web site '%s' deleted
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -38,8 +39,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
-YouCanAlsoTestWithPHPS=On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -50,7 +51,7 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. 
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Web site added

htdocs/modulebuilder/template/class/api_mymodule.class.php

@@ -120,6 +120,7 @@ class MyModuleApi extends DolibarrApi
         $restictonsocid = 0;	// Set to 1 if there is a field socid in table of object
 
         // If the internal user must only see his customers, force searching by him
+        $search_sale = 0;
         if ($restictonsocid && ! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";

htdocs/opensurvey/fonctions.php

@@ -79,7 +79,7 @@ function llxHeaderSurvey($title, $head="", $disablejs=0, $disablehead=0, $arrayo
 	// Print logo
 	if ($mysoc->logo) {
 		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file=thumbs/'.urlencode($mysoc->logo_small);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
 		}
 	}
 

htdocs/paypal/lib/paypal.lib.php

@@ -400,7 +400,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 	    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	    $urllogo=$urlwithroot."/viewimage.php?modulepart=mycompany&file=".$mysoc->logo;
+	    $urllogo=$urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
 	    $nvpstr = $nvpstr . "&LOGOIMG=" . urlencode($urllogo);
     }
     if (! empty($conf->global->PAYPAL_BRANDNAME))

htdocs/product/class/productcustomerprice.class.php

@@ -46,7 +46,7 @@ class Productcustomerprice extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -67,6 +67,7 @@ class Productcustomerprice extends CommonObject
 
 	public $lines = array ();
 
+
 	/**
 	 * Constructor
 	 *
@@ -983,7 +984,7 @@ class PriceByCustomerLine
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $price;
 	public $price_ttc;

htdocs/public/members/new.php

@@ -100,11 +100,11 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo
 
     if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
     {
-        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
     }
     elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
     {
-        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
         $width=128;
     }
     elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))

htdocs/public/onlinesign/newonlinesign.php

@@ -180,11 +180,11 @@ else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONL
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
 	$width=96;
 }
 // Output html code for logo

htdocs/public/payment/newpayment.php

@@ -681,12 +681,12 @@ else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall=$conf->global->
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width=150;
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
 	$width=150;
 }
 // Output html code for logo

htdocs/public/payment/paymentko.php

@@ -219,12 +219,12 @@ else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall=$conf->global->
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width=150;
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$logo);
 	$width=150;
 }
 // Output html code for logo

htdocs/public/payment/paymentok.php

@@ -157,12 +157,12 @@ else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall=$conf->global->
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width=150;
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$logo);
 	$width=150;
 }
 // Output html code for logo

htdocs/societe/class/companypaymentmode.class.php

@@ -127,7 +127,7 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $label;
 	public $bank;

htdocs/societe/list.php

@@ -612,7 +612,7 @@ if ($user->rights->societe->creer)
 	$newcardbutton.= '</a>';
 }
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter" autocomplete="off">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter" autocomplete="off">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

htdocs/societe/paymentmodes.php

@@ -826,7 +826,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<td></td>';
 		print '<td align="center">'.$langs->trans('Default').'</td>';
 		print '<td>'.$langs->trans('Note').'</td>';
-		print "<td></td></tr>\n";
+		print '<td>'.$langs->trans('DateModification').'</td>';
+		print "<td></td>";
+		print "</tr>\n";
 
 		$nbremote = 0;
 		$nblocal = 0;
@@ -907,6 +909,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							if (empty($companypaymentmodetemp->stripe_card_ref)) print $langs->trans("Local");
 							else print $langs->trans("LocalAndRemote");
 							print '</td>';
+							print '<td>';
+							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
+							print '</td>';
 							print '<td align="right" class="nowraponall">';
 							if ($user->rights->societe->creer)
 							{
@@ -1019,6 +1024,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<td>';
 				print $langs->trans("Remote");
 				print '</td>';
+				print '<td>';
+				print '';
+				print '</td>';
 				print '<td align="right" class="nowraponall">';
 				if ($user->rights->societe->creer)
 				{

htdocs/stripe/class/stripe.class.php

@@ -36,7 +36,7 @@ class Stripe extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+  public $fk_soc;
 
 	public $fk_key;
 

htdocs/user/passwordforgotten.php

@@ -177,11 +177,11 @@ $rowspan=2;
 $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
 if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
 }
 elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
 	$width=128;
 }
 elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))