lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-03 02:22:21 +02:00
parent 504ea85334
commit 344263f53c
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/loan/calcmens.php
View File

@ -48,7 +48,7 @@ $output=array();
$object = new LoanSchedule($db);
$int = ($capital*($rate/12));
$int = round($int ,2,PHP_ROUND_HALF_UP);
$int = round($int,2,PHP_ROUND_HALF_UP);
$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
@ -59,7 +59,7 @@ while ($echance<=$nbterm) {
$mens = round($object->calc_mens($capital,$rate,$nbterm-$echance+1),2,PHP_ROUND_HALF_UP);
$int = ($capital*($rate/12));
$int = round($int ,2,PHP_ROUND_HALF_UP);
$int = round($int,2,PHP_ROUND_HALF_UP);
$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);

40
htdocs/loan/class/loanschedule.class.php
View File

@ -24,8 +24,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/** \class LoanSchedule
* \brief Class to manage Schedule of loans
/**
* Class to manage Schedule of loans
*/
class LoanSchedule extends CommonObject
{
@ -382,10 +382,10 @@ class LoanSchedule extends CommonObject
/**
* Load all object in memory from database
*
* @param int $id Id object
* @param int $loanid Id object
* @return int <0 if KO, >0 if OK
*/
function fetchall($loan)
function fetchall($loanid)
{
global $langs;
@ -406,7 +406,7 @@ class LoanSchedule extends CommonObject
$sql.= " t.fk_user_creat,";
$sql.= " t.fk_user_modif";
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
$sql.= " WHERE t.fk_loan = ".$loan;
$sql.= " WHERE t.fk_loan = ".$loanid;
dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
$resql=$this->db->query($sql);
@ -446,6 +446,11 @@ class LoanSchedule extends CommonObject
}
}
/**
* trans_paiment
*
* @return void
*/
function trans_paiment()
{
require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
@ -482,11 +487,17 @@ class LoanSchedule extends CommonObject
}
function lastpaiment($loan)
/**
* trans_paiment
*
* @param int $loanid Loan id
* @return int < 0 if KO, Date > 0 if OK
*/
function lastpaiment($loanid)
{
$sql = "SELECT p.datep";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
$sql.= " WHERE p.fk_loan = " . $loan;
$sql.= " WHERE p.fk_loan = " . $loanid;
$sql.= " ORDER BY p.datep DESC ";
$sql.= " LIMIT 1 ";
@ -500,22 +511,27 @@ class LoanSchedule extends CommonObject
}
}
function paimenttorecord($loan,$datemax)
/**
* paimenttorecord
*
* @param int $loanid Loan id
* @param int $datemax Date max
* @return array Array of id
*/
function paimenttorecord($loanid, $datemax)
{
$sql = "SELECT p.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
$sql.= " WHERE p.fk_loan = " . $loan;
if(!empty($datemax)){ $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
$sql.= " WHERE p.fk_loan = " . $loanid;
if (!empty($datemax)) { $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
$resql=$this->db->query($sql);
if($resql){
while($obj = $this->db->fetch_object($resql))
{
$result[] = $obj->rowid;
}
}

2
htdocs/loan/createschedule.php
View File

@ -160,7 +160,7 @@ if ($object->nbterm > 0 && count($echeance->lines)==0)
while($i <$object->nbterm+1){
$mens = round($echeance->calc_mens($capital, $object->rate/100, $object->nbterm-$i+1),2,PHP_ROUND_HALF_UP);
$int = ($capital*($object->rate/12))/100;
$int = round($int ,2,PHP_ROUND_HALF_UP);
$int = round($int,2,PHP_ROUND_HALF_UP);
$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
print '<tr>';
print '<td align="center" id="n'.$i.'">' . $i .'</td>';