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

htdocs/compta/bank/account.php

@@ -833,7 +833,7 @@ if ($id > 0 || ! empty($ref))
 						{
 							$loanstatic->label=$links[$key]['label'];
 						}
-						$loanstatic->ref=$loanstatic->label;
+						$loanstatic->ref=$links[$key]['url_id'];
 						print $loanstatic->getLinkUrl(1,16);
 					}
 					else if ($links[$key]['type']=='member')

htdocs/compta/facture/list.php

@@ -767,6 +767,11 @@ if (! $sall)
     $sql.= ' f.datec, f.tms,';
     $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client, typent.code';
     $sql.= ' ,state.code_departement, state.nom';
+
+    foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
+    {
+        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+    }
 }
 else
 {

htdocs/langs/en_US/loan.lang

@@ -4,6 +4,7 @@ Loans=Loans
 NewLoan=New Loan
 ShowLoan=Show Loan
 PaymentLoan=Loan payment
+LoanPayment=Loan payment
 ShowLoanPayment=Show Loan Payment
 LoanCapital=Capital
 Insurance=Insurance

htdocs/langs/en_US/main.lang

@@ -505,6 +505,7 @@ ReportPeriod=Report period
 ReportDescription=Description
 Report=Report
 Keyword=Keyword
+Origin=Origin
 Legend=Legend
 Fill=Fill
 Reset=Reset

htdocs/loan/card.php

@@ -491,7 +491,6 @@ if ($id > 0)
 			print '<td align="center">'.$langs->trans("Insurance").'</td>';
 			print '<td align="center">'.$langs->trans("Interest").'</td>';
       		print '<td align="center">'.$langs->trans("LoanCapital").'</td>';
-      		print '<td>&nbsp;</td>';
       		print '</tr>';
 
 			$var=True;

htdocs/loan/class/paymentloan.class.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014		Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2016	Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -385,6 +385,7 @@ class PaymentLoan extends CommonObject
      *      All payment properties must have been set first like after a call to create().
      *
      *      @param	User	$user               Object of user making payment
+     *      @param  int		$fk_loan            Id of fk_loan to do link with this payment
      *      @param  string	$mode               'payment_loan'
      *      @param  string	$label              Label to use in bank record
      *      @param  int		$accountid          Id of bank account to do link with
@@ -392,7 +393,7 @@ class PaymentLoan extends CommonObject
      *      @param  string	$emetteur_banque    Name of bank
      *      @return int                 		<0 if KO, >0 if OK
      */
-    function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+    function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
     {
         global $conf;
 
@@ -445,11 +446,10 @@ class PaymentLoan extends CommonObject
                     }
                 }
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+                // Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                //$linkaddedforthirdparty=array();
                 if ($mode == 'payment_loan')
                 {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
+                    $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
                     if ($result <= 0) dol_print_error($this->db);
                 }
             }

htdocs/loan/payment/card.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

htdocs/loan/payment/payment.php

@@ -116,7 +116,7 @@ if ($action == 'add_payment')
 
             if (! $error)
             {
-                $result = $payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
+                $result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
                 if (! $result > 0)
                 {
                     setEventMessages($payment->error, $payment->errors, 'errors');
@@ -175,7 +175,7 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$loan->label."</td></tr>\n";
 	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">'.price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
-	$sql = "SELECT SUM(amount_capital + amount_insurance + amount_interest) as total";
+	$sql = "SELECT SUM(amount_capital) as total";
 	$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan";
 	$sql.= " WHERE fk_loan = ".$chid;
 	$resql = $db->query($sql);