diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index ff580fad58c..1eeac5410b2 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -40,6 +40,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
  * Main
  */
 
+$includecustom=0;
 $includeconstants=array();
 
 if (empty($argv[1])) 
@@ -67,8 +68,6 @@ while ($i < $argc)
 
 if (empty($includecustom))
 {
-    $includecustom=0;
-
     if (DOL_VERSION != $release)
     {
         print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n";
@@ -80,7 +79,7 @@ else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
-        print 'Error: When parameter "includecustom" is not set, version declared into ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
         print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
         exit -1;
     }
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 74479a9d39f..e6bae2f73d8 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -142,18 +142,17 @@ if ($action == 'setmanagezero') {
 }
 
 if ($action == 'setdisabledirectinput') {
-    $setdisabledirectinput = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-    if (! $res > 0)
-        $error ++;
-        if (! $error) {
-            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("Error"), null, 'mesgs');
-        }
+	$setdisabledirectinput = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+		if (! $error) {
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("Error"), null, 'mesgs');
+		}
 }
 
-
 /*
  * View
  */
@@ -243,20 +242,20 @@ if (! empty($user->admin))
     }
     print '</tr>';
 
-    $var = ! $var;
-    print "<tr " . $bc[$var] . ">";
-    print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
-    if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
-    
+	$var = ! $var;
+	print "<tr " . $bc[$var] . ">";
+	print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
+	if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+
     $var = ! $var;
     print "<tr " . $bc[$var] . ">";
     print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index aee7d7172c6..4174ee7809f 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -369,22 +369,23 @@ class AccountingAccount extends CommonObject
 	 */
 	function getNomUrl($withpicto = 0) {
 		global $langs;
-		
+
 		$result = '';
-		
+
 		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
 		$linkend = '</a>';
-		
+
 		$picto = 'billr';
-		
+
 		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
-		
+
 		if ($withpicto)
 			$result .= ($link . img_object($label, $picto) . $linkend);
 		if ($withpicto && $withpicto != 2)
 			$result .= ' ';
 		if ($withpicto != 2)
-			$result .= $link . $this->account_number . $linkend;
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
 		return $result;
 	}
 	
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index de0e6d70b4c..9af9b6f4707 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -4,8 +4,9 @@
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry    	 <florian.henry@open-cooncept.pro>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015       Jean-François Ferry	 <jfefe@aternatik.fr>
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -396,40 +397,37 @@ if ($id > 0 || ! empty($ref))
     foreach ($bankcateg->fetchAll() as $bankcategory) {
         $options[$bankcategory->id] = $bankcategory->label;
     }
-    
+
     // Bank card
-    
     $head=bank_prepare_head($object);
     dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
-    
+
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    
+
     dol_fiche_end();
  
-
-
     /*
      * Buttons actions
      */
-    if ($action != 'addline' && $action != 'reconcile')
+    if ($action != 'reconcile')
     {
         print '<div class="tabsAction">';
-    
-        if ($action != 'addline')
-        {
-            if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
-            {
-                if ($user->rights->banque->modifier) {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord").'</a>';
-                } else {
-                    print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-                }
-            } else {
-                print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-            }
-        }
+
+		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
+		{
+			if ($user->rights->banque->modifier) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$account.'">'.$langs->trans("AddBankRecord").'</a>';
+			} else {
+				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+			}
+		}
+		else
+		{
+			print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+		}
+
         if ($object->canBeConciliated() > 0) {
             // If not cash account and can be reconciliate
             if ($user->rights->banque->consolidate) {
@@ -640,49 +638,6 @@ if ($resql)
 //	    print '</td></tr></table>';
 	}
 
-	// Form to add a transaction with no invoice
-	if ($user->rights->banque->modifier && $action == 'addline')
-	{
-	    print load_fiche_titre($langs->trans("AddBankRecordLong"),'','');
-	
-	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans("Date").'</td>';
-	    print '<td>&nbsp;</td>';
-	    print '<td>'.$langs->trans("Type").'</td>';
-	    print '<td>'.$langs->trans("Numero").'</td>';
-	    print '<td colspan="2">'.$langs->trans("Description").'</td>';
-	    print '<td align=right>'.$langs->trans("Debit").'</td>';
-	    print '<td align=right>'.$langs->trans("Credit").'</td>';
-	    print '<td colspan="2" align="center">&nbsp;</td>';
-	    print '</tr>';
-	
-	    print '<tr '.$bcnd[false].'>';
-	    print '<td class="nowrap" colspan="2">';
-	    $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction');
-	    print '</td>';
-	    print '<td class="nowrap">';
-	    $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1);
-	    print '</td><td>';
-	    print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq").'"></td>';
-	    print '<td colspan="2">';
-	    print '<input name="label" class="flat" type="text" size="24"  value="'.GETPOST("label").'">';
-	    if ($options) {
-	        print '<br>'.$langs->trans("Rubrique").': ';
-	        print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
-	    }
-	    print '</td>';
-	    print '<td align="right"><input name="adddebit" class="flat" type="text" size="4" value="'.GETPOST("adddebit").'"></td>';
-	    print '<td align="right"><input name="addcredit" class="flat" type="text" size="4" value="'.GETPOST("addcredit").'"></td>';
-	    print '<td colspan="2" align="center">';
-	    print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    print '</td></tr>';
-	    print '</table>';
-	    print '<br>';
-	}	
-	
-	
 	/// ajax to adjust value date with plus and less picto
 	print '
     <script type="text/javascript">
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
new file mode 100644
index 00000000000..2cbd75146df
--- /dev/null
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -0,0 +1,527 @@
+<?php
+/* Copyright (C) 2017 		Alexandre Spangaro   <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/compta/bank/class/paymentvarious.class.php
+ *      \ingroup    salaries
+ *      \brief		Class for salaries module payment
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+
+
+/**
+ *  Class to manage various payments
+ */
+class PaymentVarious extends CommonObject
+{
+	//public $element='payment_various';			//!< Id that identify managed objects
+	//public $table_element='payment_various';	//!< Name of table without prefix where object is stored
+
+	var $tms;
+	var $datep;
+	var $datev;
+	var $sens;
+	var $amount;
+	var $type_payment;
+	var $num_payment;
+	var $label;
+	var $accountancy_code;
+	var $fk_bank;
+	var $fk_user_author;
+	var $fk_user_modif;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		$this->element = 'payment_various';
+		$this->table_element = 'payment_various';
+		return 1;
+	}
+
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		// Clean parameters
+		$this->fk_user=trim($this->fk_user);
+		$this->amount=trim($this->amount);
+		$this->label=trim($this->label);
+		$this->note=trim($this->note);
+		$this->fk_bank=trim($this->fk_bank);
+		$this->fk_user_author=trim($this->fk_user_author);
+		$this->fk_user_modif=trim($this->fk_user_modif);
+
+		$this->db->begin();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
+
+		$sql.= " tms=".$this->db->idate($this->tms).",";
+		$sql.= " fk_user='".$this->fk_user."',";
+		$sql.= " datep=".$this->db->idate($this->datep).",";
+		$sql.= " datev=".$this->db->idate($this->datev).",";
+		$sql.= " sens=".$this->sens.",";
+		$sql.= " amount='".$this->amount."',";
+		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
+		$sql.= " num_payment='".$this->num_payment."',";
+		$sql.= " label='".$this->db->escape($this->label)."',";
+		$sql.= " note='".$this->db->escape($this->note)."',";
+		$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
+		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
+		$sql.= " fk_user_author='".$this->fk_user_author."',";
+		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		if (! $notrigger)
+		{
+            // Call trigger
+            $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id, $user=null)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " v.rowid,";
+
+		$sql.= " v.tms,";
+		$sql.= " v.datep,";
+		$sql.= " v.datev,";
+		$sql.= " v.sens,";
+		$sql.= " v.amount,";
+		$sql.= " v.fk_typepayment,";
+		$sql.= " v.num_payment,";
+		$sql.= " v.label,";
+		$sql.= " v.note,";
+		$sql.= " v.accountancy_code,";
+		$sql.= " v.fk_bank,";
+		$sql.= " v.fk_user_author,";
+		$sql.= " v.fk_user_modif,";
+		$sql.= " b.fk_account,";
+		$sql.= " b.fk_type,";
+		$sql.= " b.rappro";
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+		$sql.= " WHERE v.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				$this->tms				= $this->db->jdate($obj->tms);
+				$this->fk_user			= $obj->fk_user;
+				$this->datep			= $this->db->jdate($obj->datep);
+				$this->datev			= $this->db->jdate($obj->datev);
+				$this->sens				= $obj->sens;
+				$this->amount			= $obj->amount;
+				$this->type_payement	= $obj->fk_typepayment;
+				$this->num_payment		= $obj->num_payment;
+				$this->label			= $obj->label;
+				$this->note				= $obj->note;
+				$this->accountancy_code	= $obj->accountancy_code;
+				$this->fk_bank			= $obj->fk_bank;
+				$this->fk_user_author	= $obj->fk_user_author;
+				$this->fk_user_modif	= $obj->fk_user_modif;
+				$this->fk_account		= $obj->fk_account;
+				$this->fk_type			= $obj->fk_type;
+				$this->rappro			= $obj->rappro;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function delete($user)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		// Call trigger
+		$result=$this->call_trigger('PAYMENT_VARIOUS_DELETE',$user);
+		if ($result < 0) return -1;
+		// End call triggers
+
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_various";
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+
+		$this->tms='';
+		$this->fk_user='';
+		$this->datep='';
+		$this->datev='';
+		$this->sens='';
+		$this->amount='';
+		$this->label='';
+		$this->note='';
+		$this->fk_bank='';
+		$this->fk_user_author='';
+		$this->fk_user_modif='';
+	}
+
+    /**
+     *  Create in database
+     *
+     *  @param      User	$user       User that create
+     *  @return     int      			<0 if KO, >0 if OK
+     */
+	function create($user)
+	{
+		global $conf,$langs;
+
+		$error=0;
+		$now=dol_now();
+
+		// Clean parameters
+		$this->amount=price2num(trim($this->amount));
+		$this->label=trim($this->label);
+		$this->note=trim($this->note);
+		$this->fk_bank=trim($this->fk_bank);
+		$this->fk_user_author=trim($this->fk_user_author);
+		$this->fk_user_modif=trim($this->fk_user_modif);
+
+		// Check parameters
+		if (! $this->label)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+			return -3;
+		}
+		if ($this->amount < 0 || $this->amount == '')
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"));
+			return -5;
+		}
+		if (! empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Account"));
+			return -6;
+		}
+		if (! empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
+			return -7;
+		}
+
+		$this->db->begin();
+
+		// Insert into llx_payment_various
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_various (";
+		$sql.= " datep";
+		$sql.= ", datev";
+		$sql.= ", sens";
+		$sql.= ", amount";
+		$sql.= ", fk_typepayment";
+		$sql.= ", num_payment";
+		if ($this->note) $sql.= ", note";
+		$sql.= ", label";
+		$sql.= ", accountancy_code";
+		$sql.= ", fk_user_author";
+		$sql.= ", datec";
+		$sql.= ", fk_bank";
+		$sql.= ", entity";
+		$sql.= ")";
+		$sql.= " VALUES (";
+		$sql.= "'".$this->db->idate($this->datep)."'";
+		$sql.= ", '".$this->db->idate($this->datev)."'";
+		$sql.= ", '".$this->sens."'";
+		$sql.= ", ".$this->amount;
+		$sql.= ", '".$this->type_payment."'";
+		$sql.= ", '".$this->num_payment."'";
+		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
+		$sql.= ", '".$this->db->escape($this->label)."'";
+		$sql.= ", '".$this->accountancy_code."'";
+		$sql.= ", '".$user->id."'";
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", NULL";
+		$sql.= ", ".$conf->entity;
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_various");
+
+			if ($this->id > 0)
+			{
+				if (! empty($conf->banque->enabled) && ! empty($this->amount))
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+					$acc = new Account($this->db);
+					$result=$acc->fetch($this->accountid);
+					if ($result <= 0) dol_print_error($this->db);
+
+					// Insert payment into llx_bank
+					// Add link 'payment_various' in bank_url between payment and bank transaction
+					if ($this->sens == '0') $sign='-';
+
+					$bank_line_id = $acc->addline(
+						$this->datep,
+						$this->type_payment,
+						$this->label,
+						$sign.abs($this->amount),
+						$this->num_payment,
+						'',
+						$user
+					);
+
+					// Update fk_bank into llx_paiement.
+					// So we know the payment which has generate the banking ecriture
+					if ($bank_line_id > 0)
+					{
+						$this->update_fk_bank($bank_line_id);
+					}
+					else
+					{
+						$this->error=$acc->error;
+						$error++;
+					}
+
+					if (! $error)
+					{
+						// Add link 'payment_various' in bank_url between payment and bank transaction
+						$url=DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id=';
+
+						$result=$acc->add_url_line($bank_line_id, $this->id, $url, "(VariousPayment)", "payment_various");
+						if ($result <= 0)
+						{
+							$this->error=$acc->error;
+							$error++;
+						}
+					}
+
+					if ($result <= 0)
+					{
+						$this->error=$acc->error;
+						$error++;
+					}
+				}
+
+	            // Call trigger
+	            $result=$this->call_trigger('PAYMENT_VARIOUS_CREATE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
+
+			}
+			else $error++;
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update link between payment various and line generate into llx_bank
+	 *
+	 *  @param	int		$id_bank    Id bank account
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function update_fk_bank($id_bank)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
+		$sql.= ' WHERE rowid = '.$this->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Send name clicable (with possibly the picto)
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	string	$option			link option
+	 *	@return	string					Chaine with URL
+	 */
+	function getNomUrl($withpicto=0,$option='')
+	{
+		global $langs;
+
+		$result='';
+        $label=$langs->trans("ShowVariousPayment").': '.$this->ref;
+
+        $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend='</a>';
+
+		$picto='payment';
+
+        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+		return $result;
+	}
+
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT v.rowid, v.datec, v.fk_user_author';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
+		$sql.= ' WHERE v.rowid = '.$id;
+
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modif = $muser;
+				}
+				$this->date_modif = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+}
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 53153c62189..558f1b0c042 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  *
@@ -374,6 +374,12 @@ if ($result)
                     print img_object($langs->trans('ShowUser'),'user').' ';
                     print $langs->trans("User");
                     print '</a>';
+                }
+				else if ($links[$key]['type']=='payment_various') {
+                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
+                    print img_object($langs->trans('ShowVariousPayment'),'payment').' ';
+                    print $langs->trans("VariousPayment");
+                    print '</a>';
                 }
                 else {
                     print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
new file mode 100644
index 00000000000..4875ac593c6
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -0,0 +1,409 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/bank/various_expenses/card.php
+ *      \ingroup    bank
+ *		\brief      Page of various expenses
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+$langs->load("users");
+$langs->load("accountancy");
+
+$id=GETPOST("id",'int');
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
+$label=GETPOST("label","alpha");
+$sens=GETPOST("sens","int");
+$amount=GETPOST("amount");
+$paymenttype=GETPOST("paymenttype");
+$accountancy_code=GETPOST("accountancy_code","int");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'banque', '', '', '');
+
+$object = new PaymentVarious($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('variouscard','globalcard'));
+
+
+
+/**
+ * Actions
+ */
+
+if (! empty($cancel))
+{
+	header("Location: index.php");
+	exit;
+}
+
+if ($action == 'add' && empty($cancel))
+{
+	$error=0;
+
+	$datep=dol_mktime(12,0,0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
+	$datev=dol_mktime(12,0,0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
+	if (empty($datev)) $datev=$datep;
+	
+	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
+	$object->datev=$datev;
+	$object->datep=$datep;
+	$object->amount=price2num(GETPOST("amount"));
+	$object->label=GETPOST("label");
+	$object->note=GETPOST("note");
+	$object->type_payment=GETPOST("paymenttype") > 0 ? GETPOST("paymenttype", "int") : 0;
+	$object->num_payment=GETPOST("num_payment");
+	$object->fk_user_author=$user->id;
+	$object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code","int") : "";
+
+	if (empty($datep) || empty($datev))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$error++;
+	}
+	if (empty($object->type_payment) || $object->type_payment < 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
+		$error++;
+	}
+	if (empty($object->amount))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+		$error++;
+	}
+	if (! empty($conf->banque->enabled) && ! $object->accountid > 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$db->begin();
+
+		$ret=$object->create($user);
+		if ($ret > 0)
+		{
+			$db->commit();
+			header("Location: index.php");
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action="create";
+		}
+	}
+
+	$action='create';
+}
+
+if ($action == 'delete')
+{
+	$result=$object->fetch($id);
+
+	if ($object->rappro == 0)
+	{
+		$db->begin();
+
+		$ret=$object->delete($user);
+		if ($ret > 0)
+		{
+			if ($object->fk_bank)
+			{
+				$accountline=new AccountLine($db);
+				$result=$accountline->fetch($object->fk_bank);
+				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+			}
+
+			if ($result >= 0)
+			{
+				$db->commit();
+				header("Location: ".DOL_URL_ROOT.'/compta/salaries/index.php');
+				exit;
+			}
+			else
+			{
+				$object->error=$accountline->error;
+				$db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
+	}
+}
+
+
+/*
+ *	View
+ */
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+$form = new Form($db);
+if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+
+if ($id)
+{
+	$object = new PaymentVarious($db);
+	$result = $object->fetch($id);
+	if ($result <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Create mode                                                                */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'create')
+{
+	print '<form name="salary" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	print load_fiche_titre($langs->trans("NewVariousPayment"),'', 'title_accountancy.png');
+
+	dol_fiche_head('', '');
+	
+	print '<table class="border" width="100%">';
+
+	// Date payment
+	print '<tr><td>';
+	print fieldLabel('DatePayment','datep',1).'</td><td>';
+	print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1);
+	print '</td></tr>';
+
+	// Date value for bank
+	print '<tr><td>';
+	print fieldLabel('DateValue','datev',0).'</td><td>';
+	print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1);
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>';
+	print fieldLabel('Label','label',1).'</td><td>';
+	print '<input name="label" id="label" class="minwidth300" value="'.($label?$label:$langs->trans("VariousPayment")).'">';
+	print '</td></tr>';
+
+	// Sens
+	print '<tr><td>';
+	print fieldLabel('Sens','sens',1).'</td><td>';
+    $sensarray=array( '0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+    print $form->selectarray('sens',$sensarray,$sens);
+	print '</td></tr>';
+
+	// Amount
+	print '<tr><td>';
+	print fieldLabel('Amount','amount',1).'</td><td>';
+	print '<input name="amount" id="amount" class="minwidth100" value="'.$amount.'">';
+	print '</td></tr>';
+
+	// Bank
+	if (! empty($conf->banque->enabled))
+	{
+		print '<tr><td>';
+		print fieldLabel('BankAccount','selectaccountid',1).'</td><td>';
+		$form->select_comptes($accountid,"accountid",0,'',1);  // Affiche liste des comptes courant
+		print '</td></tr>';
+	}
+
+	// Type payment
+	print '<tr><td>';
+	print fieldLabel('PaymentMode','selectpaymenttype',1).'</td><td>';
+	$form->select_types_paiements($paymenttype, "paymenttype");
+	print '</td></tr>';
+
+	// Number
+	if (! empty($conf->banque->enabled))
+	{
+		// Number
+		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '</label></td>';
+		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+	}
+
+	// Accountancy account
+	if (! empty($conf->accounting->enabled))
+	{
+		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
+        print '<td>';
+		print $formaccountancy->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
+        print '</td></tr>';
+	}			
+	else // For external software 
+	{
+		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
+		print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code" value="'.$accountancy_code.'">';
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="1"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* View mode                                                                  */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($id)
+{
+
+	$head=various_payment_prepare_head($object);
+
+	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), 0, 'payment');
+
+	print '<table class="border" width="100%">';
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+    print "<tr>";
+	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
+	print dol_print_date($object->datep,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
+	print dol_print_date($object->datev,'day');
+	print '</td></tr>';
+
+	// Debit / Credit
+	if ($object->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+	print '<tr><td>'.$langs->trans("Sens").'</td><td>'.$sens.'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+
+	// Accountancy code
+	print '<tr><td class="nowrap">';
+	print $langs->trans("AccountAccounting");
+	print '</td><td>';
+	if (! empty($conf->accounting->enabled))
+	{
+		$accountancyaccount = new AccountingAccount($db);
+		$accountancyaccount->fetch('',$object->accountancy_code);
+
+		print $accountancyaccount->getNomUrl(1);
+		// print length_accountg($object->accountancy_code);
+	} else {
+		print $object->accountancy_code;
+	}
+	print '</td></tr>';
+
+	if (! empty($conf->banque->enabled))
+	{
+		if ($object->fk_account > 0)
+		{
+			$bankline=new AccountLine($db);
+			$bankline->fetch($object->fk_bank);
+
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<td colspan="3">';
+			print $bankline->getNomUrl(1,0,'showall');
+			print '</td>';
+			print '</tr>';
+		}
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="1"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	
+	/*
+	 * Action buttons
+	 */
+	print '<div class="tabsAction">'."\n";
+	if ($object->rappro == 0)
+	{
+		if (! empty($user->rights->banque->delete))
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
+		}
+	}
+	else
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
+	}
+	print "</div>";
+}
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
new file mode 100644
index 00000000000..3fa15deb9c2
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *       \file       htdocs/compta/bank/various_payment/document.php
+ *       \ingroup    banque
+ *       \brief      Page of linked files onto various_payment
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+
+$langs->load("other");
+$langs->load("bank");
+$langs->load("companies");
+
+$id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', $id, '');
+
+
+// Get parameters
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+
+$object = new PaymentVarious($db);
+$object->fetch($id, $ref);
+
+$upload_dir = $conf->banque->dir_output.'/'.dol_sanitizeFileName($object->id);
+$modulepart='banque';
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+
+if ($object->id)
+{
+	$head=various_payment_prepare_head($object);
+
+	dol_fiche_head($head, 'documents',  $langs->trans("VariousPayment"), 0, 'payment');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+    print '<table class="border" width="100%">';
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+	print '</td></tr>';
+
+	// Societe
+	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+
+    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+
+    $modulepart = 'banque';
+    $permission = $user->rights->banque->modifier;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+
+}
+else
+{
+	print $langs->trans("ErrorUnknown");
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
new file mode 100644
index 00000000000..7366c0cf2a5
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -0,0 +1,259 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/bank/various_payment/index.php
+ *      \ingroup    bank
+ *		\brief     	List of various payments
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'banque', '', '', '');
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$search_ref = GETPOST('search_ref','int');
+$search_user = GETPOST('search_user','alpha');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
+$search_account = GETPOST('search_account','int');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="v.datep";
+if (! $sortorder) $sortorder="DESC";
+$optioncss = GETPOST('optioncss','alpha');
+
+$filtre=$_GET["filtre"];
+
+if (empty($_REQUEST['typeid']))
+{
+	$newfiltre=str_replace('filtre=','',$filtre);
+	$filterarray=explode('-',$newfiltre);
+	foreach($filterarray as $val)
+	{
+		$part=explode(':',$val);
+		if ($part[0] == 'v.fk_typepayment') $typeid=$part[1];
+	}
+}
+else
+{
+	$typeid=$_REQUEST['typeid'];
+}
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_label="";
+	$search_amount="";
+	$search_account='';
+    $typeid="";
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+$variousstatic = new PaymentVarious($db);
+$accountstatic = new Account($db);
+
+$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " pst.code as payment_code";
+$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql.= " WHERE v.entity = ".$conf->entity;
+
+// Search criteria
+if ($search_ref)	$sql.=" AND v.rowid=".$search_ref;
+if ($search_label) 	$sql.=natural_search(array('v.label'), $search_label);
+if ($search_amount) $sql.=natural_search("v.amount", $search_amount, 1);
+if ($search_account > 0) $sql .=" AND b.fk_account=".$search_account;
+if ($filtre) {
+    $filtre=str_replace(":","=",$filtre);
+    $sql .= " AND ".$filtre;
+}
+if ($typeid) {
+    $sql .= " AND v.fk_typepayment=".$typeid;
+}
+$sql.= $db->order($sortfield,$sortorder);
+
+//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, v.rowid, v.fk_user, v.amount, v.label, v.datev, v.fk_typepayment, v.num_payment, pst.code";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
+$sql.= $db->plimit($limit+1,$offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    $total = 0 ;
+	$var=true;
+
+	$param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($typeid) $param.='&amp;typeid='.$typeid;
+	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
+
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    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">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+	print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+	
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"v.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"v.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Sens"),$_SERVER["PHP_SELF"],"v.sens","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	// Ref
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	// Label
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	// Date
+	print '<td class="liste_titre">&nbsp;</td>';
+	// Type
+	print '<td class="liste_titre" align="left">';
+	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
+	print '</td>';
+	// Account
+	if (! empty($conf->banque->enabled))
+    {
+	    print '<td class="liste_titre">';
+	    $form->select_comptes($search_account,'search_account',0,'',1);
+	    print '</td>';
+    }
+	// Amount
+	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	// Sens
+	print '<td class="liste_titre">&nbsp;</td>';
+
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
+    print '</td>';
+    
+	print "</tr>\n";
+
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($result);
+        $var=!$var;
+        print "<tr ".$bc[$var].">";
+
+        $variousstatic->id=$obj->rowid;
+		$variousstatic->ref=$obj->rowid;
+        // Ref
+		print "<td>".$variousstatic->getNomUrl(1)."</td>\n";
+		// Label payment
+        print "<td>".dol_trunc($obj->label,40)."</td>\n";
+		// Date payment
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
+        // Type
+        print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+		// Account
+    	if (! empty($conf->banque->enabled))
+	    {
+	        print '<td>';
+	        if ($obj->fk_bank > 0)
+	        {
+	        	//$accountstatic->fetch($obj->fk_bank);
+	            $accountstatic->id=$obj->bid;
+	            $accountstatic->ref=$obj->bref;
+	            $accountstatic->number=$obj->bnumber;
+	            $accountstatic->accountancy_number=$obj->account_number;
+	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+	            $accountstatic->label=$obj->blabel;
+	        	print $accountstatic->getNomUrl(1);
+	        }
+	        else print '&nbsp;';
+	        print '</td>';
+	    }
+        // Amount
+        print "<td align=\"right\">".price($obj->amount)."</td>";
+        // Sens
+		if ($obj->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+        print "<td align=\"right\">".$sens."</td>";
+        print "<td></td>";
+        print "</tr>\n";
+
+        $total = $total + $obj->amount;
+
+        $i++;
+    }
+
+    $colspan=4;
+    if (! empty($conf->banque->enabled)) $colspan++;
+    print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
+    print '<td class="liste_total" align="right">'.price($total)."</td>";
+	print "<td></td></tr>";
+
+    print "</table>";
+    print '</div>';
+	print '</form>';
+
+    $db->free($result);
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
new file mode 100644
index 00000000000..73c1baa5c02
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/bank/various_payment/info.php
+ *	\ingroup    salaries
+ *	\brief      Page with info about salaries contribution
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("salaries");
+
+$id=GETPOST('id','int');
+$action=GETPOST("action");
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', '', '', '');
+
+
+/*
+ * View
+ */
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+$object = new PaymentVarious($db);
+$result = $object->fetch($id);
+$object->info($id);
+
+$head = various_payment_prepare_head($object);
+
+dol_fiche_head($head, 'info', $langs->trans("VariousPayment"), 0, 'payment');
+
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($object);
+print '</td></tr></table>';
+
+print '</div>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index aad49656e2e..8ed52eddb97 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1210,7 +1210,12 @@ if ($resql)
         }
 
     	// Show total line
-    	if (isset($totalarray['totalhtfield']))
+    	if (isset($totalarray['totalhtfield'])
+	   || isset($totalarray['totalvatfield'])
+	   || isset($totalarray['totalttcfield'])
+	   || isset($totalarray['totalamfield'])
+	   || isset($totalarray['totalrtpfield'])
+	   )
     	{
     		print '<tr class="liste_total">';
     		$i=0;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7d95da69aef..dfa6eec515c 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -673,7 +673,8 @@ else
 
             print "</table><br>";
 
-
+			print '<hr style="margin-bottom: 20px">';
+			
             // Add personnal information
             print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 802b547eae8..1dfb5a08855 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -867,9 +867,9 @@ class FormFile
 
     			// Preview
     			$urladvanced = getAdvancedPreviewUrl($modulepart, $relativepath);
-    		    if ($urladvanced) $tmpout.= '<li><a data-ajax="false" href="'.$urladvanced.'">'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+    		    if ($urladvanced) $tmpout.= '<li><a href="'.$urladvanced.'">'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
     			// Download
-    		    $tmpout.= '<li><a data-ajax="false" class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+    		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
     			if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
     			$tmpout.= '>';
@@ -1679,11 +1679,12 @@ class FormFile
         $out='';
         if ($conf->browser->layout != 'phone')
         {
-            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath);      // Return if a file is qualified for preview
-            if ($urladvancedpreview)
+            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1);      // Return if a file is qualified for preview.
+            if (count($urladvancedpreview))
             {
-                $out.= '<a data-ajax="false" class="pictopreview" href="'.$urladvancedpreview.'">';
-                if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+                //$out.= '<a class="pictopreview">';
+            	if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
                 else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
                 $out.= '</a>';
             }
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 47d3539e3ba..8e9fb7bc77a 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -134,6 +134,51 @@ function bank_admin_prepare_head($object)
 	return $head;
 }
 
+/**
+ * Prepare array with list of tabs
+ *
+ * @param   Object	$object		Object related to tabs
+ * @return  array				Array of tabs to shoc
+ */
+function various_payment_prepare_head($object) {
+	
+	global $db, $langs, $conf;
+	
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment');
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+    
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
+
+	return $head;
+}
+
 /**
  *      Check SWIFT informations for a bank account
  *
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index bfb893d92ee..fb901198852 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -693,7 +693,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $colspan=9;
     print '<tr class="liste_titre">';
-    print_liste_field_titre('');
     print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Poste"),$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
@@ -728,21 +727,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     {
         print '<tr class="liste_titre">';
         
-        // Photo
-        print '<td class="liste_titre">';
-        print '</td>';
-        
-        // Name - Position
+        // Photo - Name
         print '<td class="liste_titre">';
         print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
         print '</td>';
     
-        // Address / Phone
+        // Position
         print '<td class="liste_titre">';
-        //print '<input type="text" class="flat" name="search_addressphone" size="20" value="'.$search_addressphone.'">';
         print '</td>';
     
-        // Email
+        // Address - Phone - Email
         print '<td class="liste_titre">&nbsp;</td>';
     
         // Status
@@ -797,14 +791,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             
             print "<tr ".$bc[$var].">";
 
-            // Photo
-            print '<td width="50px">';
-            print $form->showphoto('contact',$contactstatic,0,0,0,'photorefnoborder','small',1,0,1);
-			print '</td>';
-            
-			// Name
+			// Photo - Name
 			print '<td>';
-            print $contactstatic->getNomUrl(0,'',0,'&backtopage='.urlencode($backtopage));
+            print $form->showphoto('contact',$contactstatic,0,0,0,'photorefnoborder valignmiddle marginrightonly','small',1,0,1);
+			print $contactstatic->getNomUrl(0,'',0,'&backtopage='.urlencode($backtopage));
 			print '</td>';
 			
 			// Job position
@@ -812,7 +802,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             if ($obj->poste) print $obj->poste;
             print '</td>';
 
-            // Address and phone
+            // Address - Phone - Email
             print '<td>';
             print $contactstatic->getBannerAddress('contact', $object);
             print '</td>';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 8e24009d367..51be81a7bd5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1807,6 +1807,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+	else if ($modulepart == 'massfilesarea_expensereport')
+	{
+	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
 	
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd2d9a00a50..06419ba5930 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5908,10 +5908,11 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  * Return URL we can use for advanced preview links
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
- * @param   string    $relativepath   Relative path of docs
- * @return  string                    Output string with HTML
+ * @param   string    $relativepath   Relative path of docs.
+ * @param	int		  $alldata		  Return array with all components (1 is recommended)  
+ * @return  string|array              Output string with href link or array with all components of link
  */
-function getAdvancedPreviewUrl($modulepart, $relativepath)
+function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0)
 {
     global $conf, $langs;
 
@@ -5921,8 +5922,15 @@ function getAdvancedPreviewUrl($modulepart, $relativepath)
     //$mime_preview[]='vnd.oasis.opendocument.presentation';
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
+ 
+    if ($alldata == 1) 
+    {
+    	if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+    	else return array();
+    }
 
-    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+    // old behavior
+    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath)).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
     else return '';
 }
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 87506217838..9204cd02aa0 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2016      Laurent Destailleur 	<eldy@users.sourceforge.net>
@@ -201,14 +201,6 @@ class modAccounting extends DolibarrModules
 				"chaine",
 				"csv"
 		);
-		/* Not required to disable this. This make not possible to do complete reconciliation.
-		Also, this is not a problem, lines added manually will be reported as "not binded into accounting export module
-		and will be binded manually to be created into general ledger
-		$this->const[24] = array(
-				"BANK_DISABLE_DIRECT_INPUT",
-				"yesno",
-				"1"
-		);*/
 
 		// Tabs
 		$this->tabs = array();
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index d0a7b45efea..61c27579b50 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -44,6 +44,7 @@ $(document).ready(function(){
     $("#<?php echo $tagidfortablednd; ?>").tableDnD({
 		onDrop: function(table, row) {
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
+			console.log("tableDND onDrop");
 			console.log($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var roworder = cleanSerialize($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var table_element_line = "<?php echo $table_element_line; ?>";
@@ -59,14 +60,15 @@ $(document).ready(function(){
 						filepath: filepath
 					},
 					function() {
+						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							location.href = '<?php echo $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']; ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
-										$(this).removeClass("pair impair");
-										if (intIndex % 2 == 0) $(this).addClass('impair');
-										if (intIndex % 2 == 1) $(this).addClass('pair');
+										// $(this).removeClass("pair impair");
+										//if (intIndex % 2 == 0) $(this).addClass('impair');
+										//if (intIndex % 2 == 1) $(this).addClass('pair');
 									});
 						}
 					});
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 13b95311dee..8e2b46459b0 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -303,7 +303,7 @@ if ($resql)
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    //'presend'=>$langs->trans("SendByMail"),
-	    //'builddoc'=>$langs->trans("PDFMerge"),
+	    'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
@@ -716,7 +716,7 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	/*
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    // Show list of available documents
@@ -727,13 +727,12 @@ if ($resql)
 	    $genallowed=$user->rights->expensereport->lire;
 	    $delallowed=$user->rights->expensereport->lire;
 	
-	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+	    print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	*/
 }
 else
 {
diff --git a/htdocs/install/doctemplates/usergroups/template_usergroup.odt b/htdocs/install/doctemplates/usergroups/template_usergroups.odt
similarity index 100%
rename from htdocs/install/doctemplates/usergroups/template_usergroup.odt
rename to htdocs/install/doctemplates/usergroups/template_usergroups.odt
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 986faf2a74c..926aaad25df 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -125,6 +125,26 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_A
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
+create table llx_payment_various
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  tms                   timestamp,
+  datec                 datetime,
+  datep                 date,
+  datev                 date,
+  sens                  smallint DEFAULT 0 NOT NULL,
+  amount                double(24,8) DEFAULT 0 NOT NULL,
+  fk_typepayment        integer NOT NULL,
+  num_payment           varchar(50),
+  label                 varchar(255),
+  accountancy_code		varchar(32),
+  entity                integer DEFAULT 1 NOT NULL,
+  note                  text,
+  fk_bank               integer,
+  fk_user_author        integer,
+  fk_user_modif         integer
+)ENGINE=innodb;
+
 -- NEW inventory module
 CREATE TABLE llx_inventory 
 ( 
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
new file mode 100644
index 00000000000..abaf9fdab26
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -0,0 +1,37 @@
+-- ===================================================================
+-- Copyright (C) 2017		Alexandre Spangaro <aspangaro@zendsi.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_payment_various
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  tms                   timestamp,
+  datec                 datetime,                   -- Create date
+  datep                 date,                       -- date de paiement
+  datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
+  sens                  smallint DEFAULT 0 NOT NULL,-- Sens of the operation: 0 for debit operation, 1 for credit operation
+  amount                double(24,8) DEFAULT 0 NOT NULL,
+  fk_typepayment        integer NOT NULL,
+  num_payment           varchar(50),				-- ref
+  label                 varchar(255),
+  accountancy_code		varchar(32),
+  entity                integer DEFAULT 1 NOT NULL,	-- multi company id
+  note                  text,
+  fk_bank               integer,
+  fk_user_author        integer,                    -- utilisateur qui a cree l'info
+  fk_user_modif         integer                     -- utilisateur qui a modifié l'info
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 9afe72f3b24..cc8501a5fcd 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -26,7 +26,7 @@ create table llx_usergroup
   datec         datetime,
   tms           timestamp,
   note          text,
-  model_pdf     varchar(255) DEFAULT NULL,
+  model_pdf     varchar(255) DEFAULT NULL
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 07a720e6537..d98d2b465d0 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -149,4 +149,8 @@ CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information. 
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New various payment
+VariousPayment=Various payment
+VariousPayments=Various payments
+ShowVariousPayment=Show various payment 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9c0a98cbcfb..7d5e5dfa64c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1882,7 +1882,9 @@ if (! function_exists("llxFooter"))
 
         if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-		// Wrapper to show tooltips
+        // TODO Move this in lib_head.js
+
+        // Wrapper to show tooltips (html or onclick popup)
         if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
         {
     		print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
@@ -1902,6 +1904,21 @@ if (! function_exists("llxFooter"))
             </script>' . "\n";
         }
         
+        // Wrapper to manage document_preview
+        if (! empty($conf->use_javascript_ajax))
+        {
+            print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
+            print '<script type="text/javascript">
+                jQuery(document).ready(function () {
+			        jQuery(".documentpreview").click(function () {
+            		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
+            		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \''.dol_escape_js($langs->transnoentities("Preview")).'\');
+                		return false;
+        			});
+        		});
+            </script>' . "\n";
+        }         
+        
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
         {
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index ae2782cc4de..cedfec4abdc 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -210,8 +210,8 @@ if ($object->id)
 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-    
-	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+    $object->next_prev_filter=" fk_product_type = ".$object->type;
+    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
     
     print '<div class="fichecenter">';
     
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ab74bc29485..ab959f479fd 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -308,7 +308,7 @@ if ($id > 0 || $ref)
 			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
 			
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
+		$object->next_prev_filter=" fk_product_type = ".$object->type;		
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
             
             print '<div class="fichecenter">';
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index e29d1a168cb..af626cce5dd 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -94,7 +94,7 @@ if ($id > 0 || $ref)
     dol_fiche_head($head, 'info', $titre, 0, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+	$object->next_prev_filter=" fk_product_type = ".$object->type;
 	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 	
 	$object->info($object->id);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 9a914527a83..c63d60229fb 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
     dol_fiche_head($head, 'note', $titre, 0, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+    $object->next_prev_filter=" fk_product_type = ".$object->type;
     dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 
     $cssclass='titlefield';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e6bde28d27e..8601ce9c05d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -657,7 +657,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 dol_fiche_head($head, 'price', $titre, 0, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+$object->next_prev_filter=" fk_product_type = ".$object->type;
 dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index f1db2d21835..42860abb98a 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -802,7 +802,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+    print '<div class="nofichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
@@ -845,7 +845,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     }
 
     print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-    print '<textarea name="domiciliation" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+    print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
     print GETPOST('domiciliation');
     print "</textarea></td></tr>";
 
@@ -854,7 +854,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     print "</td></tr>\n";
 
     print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
     print GETPOST('owner_address');
     print "</textarea></td></tr>";