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

add insurance amount on loan

Browse Source
This commit is contained in:
atm-greg 2018-10-18 17:03:49 +02:00
parent 548fafc6e9
commit ff92572d56
6 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
View File

@ -129,3 +129,6 @@ CREATE TABLE llx_takepos_floor_tables(
UPDATE llx_c_payment_term SET decalage = nbjour, nbjour = 0 where decalage IS NULL AND type_cdr = 2;
ALTER TABLE llx_loan ADD COLUMN insurance_amount double(24,8) DEFAULT 0;

1
htdocs/install/mysql/tables/llx_loan.sql
View File

@ -28,6 +28,7 @@ create table llx_loan
fk_bank integer,
capital double(24,8) default 0 NOT NULL,
insurance_amount double(24,8) default 0,
datestart date,
dateend date,
nbterm real,

18
htdocs/loan/card.php
View File

@ -135,6 +135,7 @@ if (empty($reshook))
$object->note_private = GETPOST('note_private','none');
$object->note_public = GETPOST('note_public','none');
$object->fk_project = GETPOST('projectid','int');
$object->insurance_amount = GETPOST('insurance_amount', 'int');
$accountancy_account_capital = GETPOST('accountancy_account_capital');
$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@ -148,7 +149,7 @@ if (empty($reshook))
if ($id <= 0)
{
$error++;
setEventMessages($object->error, $object->errors, 'errors');
setEventMessages($object->db->lastqueryerror, $object->errors, 'errors');
$action = 'create';
}
}
@ -301,6 +302,9 @@ if ($action == 'create')
// Rate
print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . dol_escape_htmltag(GETPOST("rate")) . '"> %</td></tr>';
// insurance amount
print '<tr><td>'.$langs->trans("Insurance").'</td><td><input name="insurance_amount" size="10" value="' . dol_escape_htmltag(GETPOST("insurance_amount")) . '" placeholder="'.$langs->trans('Amount').'"></td></tr>';
// Project
if (! empty($conf->projet->enabled))
{
@ -495,6 +499,18 @@ if ($id > 0)
{
print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
}
// Insurance
if ($action == 'edit')
{
print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
print '<input name="insurance_amount" size="10" value="' . $object->insurance_amount . '"></td></tr>';
print '</td></tr>';
}
else
{
print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
}
// Date start
print '<tr><td>'.$langs->trans("DateStart")."</td>";

16
htdocs/loan/class/loan.class.php
View File

@ -66,6 +66,8 @@ class Loan extends CommonObject
public $date_creation;
public $date_modification;
public $date_validation;
public $insurance_amount;
/**
* @var int Bank ID
@ -106,7 +108,7 @@ class Loan extends CommonObject
*/
function fetch($id)
{
$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,";
$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public, l.insurance_amount,";
$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest, l.fk_projet as fk_project";
$sql.= " FROM ".MAIN_DB_PREFIX."loan as l";
$sql.= " WHERE l.rowid = ".$id;
@ -129,6 +131,7 @@ class Loan extends CommonObject
$this->rate = $obj->rate;
$this->note_private = $obj->note_private;
$this->note_public = $obj->note_public;
$this->insurance_amount = $obj->insurance_amount;
$this->paid = $obj->paid;
$this->account_capital = $obj->accountancy_account_capital;
@ -169,6 +172,8 @@ class Loan extends CommonObject
// clean parameters
$newcapital=price2num($this->capital,'MT');
if (empty($this->insurance_amount)) $this->insurance_amount = 0;
$newinsuranceamount=price2num($this->insurance_amount, 'MT');
if (isset($this->note_private)) $this->note_private = trim($this->note_private);
if (isset($this->note_public)) $this->note_public = trim($this->note_public);
if (isset($this->account_capital)) $this->account_capital = trim($this->account_capital);
@ -205,7 +210,7 @@ class Loan extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public,";
$sql.= " accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity,";
$sql.= " datec, fk_projet, fk_user_author)";
$sql.= " datec, fk_projet, fk_user_author, insurance_amount)";
$sql.= " VALUES ('".$this->db->escape($this->label)."',";
$sql.= " '".$this->db->escape($this->fk_bank)."',";
$sql.= " '".price2num($newcapital)."',";
@ -221,7 +226,8 @@ class Loan extends CommonObject
$sql.= " ".$conf->entity.",";
$sql.= " '".$this->db->idate($now)."',";
$sql.= " ".(empty($this->fk_project)?'NULL':$this->fk_project).",";
$sql.= " ".$user->id;
$sql.= " ".$user->id.",";
$sql.= " '".price2num($newinsuranceamount)."'";
$sql.= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@ -339,7 +345,8 @@ class Loan extends CommonObject
$sql.= " accountancy_account_insurance = '".$this->db->escape($this->account_insurance)."',";
$sql.= " accountancy_account_interest = '".$this->db->escape($this->account_interest)."',";
$sql.= " fk_projet=".(empty($this->fk_project)?'NULL':$this->fk_project).",";
$sql.= " fk_user_modif = ".$user->id;
$sql.= " fk_user_modif = ".$user->id.",";
$sql.= " insurance_amount = '".price2num($this->db->escape($this->insurance_amount))."'";
$sql.= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
@ -549,7 +556,6 @@ class Loan extends CommonObject
{
$sql = 'SELECT l.rowid, l.datec, l.fk_user_author, l.fk_user_modif,';
$sql.= ' l.tms';
$sql.= ' FROM '.MAIN_DB_PREFIX.'loan as l';
$sql.= ' WHERE l.rowid = '.$id;
dol_syslog(get_class($this).'::info', LOG_DEBUG);

37
htdocs/loan/createschedule.php
View File

@ -35,7 +35,7 @@ $object = new Loan($db);
$object->fetch($loanid);
// Load translation files required by the page
$langs->loadLangs(array("loan"));
$langs->loadLangs(array("compta","bills","loan"));
if ($action == 'createecheancier') {
@ -45,6 +45,7 @@ if ($action == 'createecheancier') {
$date = GETPOST('hi_date'.$i,'int');
$mens = GETPOST('mens'.$i);
$int = GETPOST('hi_interets'.$i);
$insurance = GETPOST('hi_insurance'.$i);
$echeance = new LoanSchedule($db);
@ -53,10 +54,10 @@ if ($action == 'createecheancier') {
$echeance->tms = dol_now();
$echeance->datep = $date;
$echeance->amount_capital = $mens-$int;
$echeance->amount_insurance = 0;
$echeance->amount_insurance = $insurance;
$echeance->amount_interest = $int;
$echeance->fk_typepayment = 3;
$echeance->fk_bank = 1;
$echeance->fk_bank = 0;
$echeance->fk_user_creat = $user->id;
$echeance->fk_user_modif = $user->id;
$result=$echeance->create($user);
@ -75,11 +76,13 @@ if ($action == 'updateecheancier') {
$mens = GETPOST('mens'.$i);
$int = GETPOST('hi_interets'.$i);
$id = GETPOST('hi_rowid'.$i);
$insurance = GETPOST('hi_insurance'.$i);
$echeance = new LoanSchedule($db);
$echeance->fetch($id);
$echeance->tms = dol_now();
$echeance->amount_capital = $mens-$int;
$echeance->amount_insurance = 0;
$echeance->amount_insurance = $insurance;
$echeance->amount_interest = $int;
$echeance->fk_user_modif = $user->id;
$result= $echeance->update($user,0);
@ -143,26 +146,33 @@ if(count($echeance->lines)>0)
}
print '<table class="border" width="100%">';
print '<tr class="liste_titre">';
print '<th align="center" colspan="5">';
$colspan = 6;
if (count($echeance->lines)>0) $colspan++;
print '<th align="center" colspan="'.$colspan.'">';
print $langs->trans("FinancialCommitment");
print '</th>';
print '</tr>';
print '<tr class="liste_titre">';
Print '<th width="10%" align="center">'.$langs->trans("Term").'</th>';
Print '<th width="10%" align="center">'.$langs->trans("Date").'</th>';
Print '<th width="5%" align="center">'.$langs->trans("Term").'</th>';
Print '<th width="5%" align="center">'.$langs->trans("Date").'</th>';
print '<th width="15%" align="center">'.$langs->trans("Insurance");
Print '<th width="15%" align="center">'.$langs->trans("InterestAmount").'</th>';
Print '<th width="10%" align="center">'.$langs->trans("Amount").'</th>';
Print '<th width="20%" align="center">'.$langs->trans("InterestAmount").'</th>';
Print '<th width="40%" align="center">'.$langs->trans("CapitalRemain");
print ' ('.price2num($object->capital).')';
print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
print '</th>';
if (count($echeance->lines)>0) print '<th>'.$langs->trans('DoPayment').'</th>';
print '</tr>'."\n";
if ($object->nbterm > 0 && count($echeance->lines)==0)
{
$i=1;
$capital = $object->capital;
$insurance = $object->insurance_amount/$object->nbterm;
$insurance = price2num($insurance, 'MT');
$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
while($i <$object->nbterm+1)
{
$mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate/100, $object->nbterm-$i+1), 'MT');
@ -172,8 +182,9 @@ if ($object->nbterm > 0 && count($echeance->lines)==0)
print '<tr>';
print '<td align="center" id="n'.$i.'">' . $i .'</td>';
print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
print '</tr>'."\n";
$i++;
@ -184,6 +195,9 @@ elseif(count($echeance->lines)>0)
{
$i=1;
$capital = $object->capital;
$insurance = $object->insurance_amount/$object->nbterm;
$insurance = price2num($insurance, 'MT');
$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
foreach ($echeance->lines as $line){
$mens = $line->amount_capital+$line->amount_insurance+$line->amount_interest;
$int = $line->amount_interest;
@ -191,13 +205,16 @@ elseif(count($echeance->lines)>0)
print '<tr>';
print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
if($line->datep > dol_now()){
print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
}else{
print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
}
print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
print '<td align="center"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></td>';
print '</tr>'."\n";
$i++;
$capital = $cap_rest;

6
htdocs/loan/payment/payment.php
View File

@ -264,7 +264,7 @@ if ($action == 'create')
print '<td align="right">';
if ($sumpaid < $loan->capital)
{
print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital">';
print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital" value="'.GETPOST('amount_capital').'">';
}
else
{
@ -273,7 +273,7 @@ if ($action == 'create')
print '<br>';
if ($sumpaid < $loan->capital)
{
print $langs->trans("Insurance") .': <input type="text" size="8" name="amount_insurance">';
print $langs->trans("Insurance") .': <input type="text" size="8" name="amount_insurance" value="'.GETPOST('amount_insurance').'">';
}
else
{
@ -282,7 +282,7 @@ if ($action == 'create')
print '<br>';
if ($sumpaid < $loan->capital)
{
print $langs->trans("Interest") .': <input type="text" size="8" name="amount_interest">';
print $langs->trans("Interest") .': <input type="text" size="8" name="amount_interest" value="'.GETPOST('amount_interest').'">';
}
else
{