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

Continue to work

Browse Source
This commit is contained in:
aspangaro 2014-09-21 21:38:33 +02:00
parent 08b9e05425
commit 1409c8f450
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/compta/loan/card.php
View File

@ -24,6 +24,7 @@
require '../../main.inc.php'; require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->load("compta"); $langs->load("compta");
$langs->load("bills"); $langs->load("bills");
@ -71,16 +72,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
// Add loan // Add loan
if ($action == 'add' && $user->rights->loan->write) if ($action == 'add' && $user->rights->loan->write)
{ {
$dateech=@dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]); $datestart=dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]);
$dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]); $dateend=dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
if (! $dateech) if (! $datestart)
{ {
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors'); setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors');
$action = 'create'; $action = 'create';
} }
elseif (! $dateperiod) elseif (! $dateend)
{ {
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors'); setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors');
$action = 'create'; $action = 'create';
} }
elseif (! $_POST["capital"]) elseif (! $_POST["capital"])
@ -92,10 +93,17 @@ if ($action == 'add' && $user->rights->loan->write)
{ {
$loan = new Loan($db); $loan = new Loan($db);
$loan->label = $_POST["label"]; $loan->label = GETPOST("label");
$loan->date_ech = $dateech; $loan->fk_bank = GETPOST("accountid");
$loan->periode = $dateperiod; $loan->capital = GETPOST("capital");
$loan->capital = $_POST["capital"]; $loan->datestart = $datestart;
$loan->dateend = $dateend;
$loan->nbterm = GETPOST("nbterm");
$loan->rate = GETPOST("rate");
$loan->account_capital = GETPOST("accountancy_account_capital");
$loan->account_insurance = GETPOST("accountancy_account_insurance");
$loan->account_interest = GETPOST("accountancy_account_interest");
$id=$loan->create($user); $id=$loan->create($user);
if ($id <= 0) if ($id <= 0)
@ -125,9 +133,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write)
$loan = new Loan($db); $loan = new Loan($db);
$result=$loan->fetch($_GET["id"]); $result=$loan->fetch($_GET["id"]);
$loan->lib=$_POST["label"]; $loan->label=$_POST["label"];
$loan->date_ech=$dateech; $loan->datestart=$datestart;
$loan->periode=$dateperiod; $loan->dateend=$dateend;
$result=$loan->update($user); $result=$loan->update($user);
if ($result <= 0) if ($result <= 0)
@ -188,13 +196,13 @@ if ($action == 'create')
// Date Start // Date Start
print "<tr>"; print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
print $form->select_date($datestart?$datestart:-1,'','','','','add',1,1); print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1);
print '</td></tr>'; print '</td></tr>';
// Date End // Date End
print "<tr>"; print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date($dateend?$dateend:-1,'','','','','add',1,1); print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1);
print '</td></tr>'; print '</td></tr>';
// Number of terms // Number of terms
@ -430,7 +438,7 @@ if ($id > 0)
// Edit // Edit
if ($user->rights->loan->write) if ($user->rights->loan->write)
{ {
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a>"; print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/loan/card.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a>";
} }
// Emettre paiement // Emettre paiement

22
htdocs/compta/loan/class/loan.class.php
View File

@ -34,7 +34,7 @@ class Loan extends CommonObject
var $id; var $id;
var $ref; var $ref;
var $date_start; var $datestart;
var $dateend; var $dateend;
var $label; var $label;
var $capital; var $capital;
@ -116,8 +116,8 @@ class Loan extends CommonObject
// clean parameters // clean parameters
$newcapital=price2num($this->capital,'MT'); $newcapital=price2num($this->capital,'MT');
// Validation parametres // Check parameters
if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend))
{ {
$this->error="ErrorBadParameter"; $this->error="ErrorBadParameter";
return -2; return -2;
@ -125,10 +125,10 @@ class Loan extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, date_ech, periode, amount, entity)";
$sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',"; $sql.= " VALUES ('".$this->db->escape($this->label)."',";
$sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',"; $sql.= " '".$this->db->idate($this->datestart)."','".$this->db->idate($this->dateend)."',";
$sql.= " '".price2num($newamount)."',"; $sql.= " '".price2num($newcapital)."',";
$sql.= " ".$conf->entity; $sql.= " ".$conf->entity;
$sql.= ")"; $sql.= ")";
@ -136,9 +136,9 @@ class Loan extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales"); $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."loan");
//dol_syslog("ChargesSociales::create this->id=".$this->id); //dol_syslog("Loans::create this->id=".$this->id);
$this->db->commit(); $this->db->commit();
return $this->id; return $this->id;
} }
@ -152,7 +152,7 @@ class Loan extends CommonObject
/** /**
* Delete a social contribution * Delete a loan
* *
* @param User $user Object user making delete * @param User $user Object user making delete
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
@ -223,7 +223,7 @@ class Loan extends CommonObject
/** /**
* Met a jour une charge sociale * Update loan
* *
* @param User $user Utilisateur qui modifie * @param User $user Utilisateur qui modifie
* @return int <0 si erreur, >0 si ok * @return int <0 si erreur, >0 si ok