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

Withdrawals: Restore lost comment

Browse Source
This commit is contained in:
Juanjo Menent 2011-01-29 22:41:16 +00:00
parent 284606af73
commit 363d014516
1 changed files with 96 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@ -418,93 +418,93 @@ class BonPrelevement extends CommonObject
$this->Notify($user, "cr", $subject, $message); $this->Notify($user, "cr", $subject, $message);
//Add payment of withdrawal into bank //Add payment of withdrawal into bank
$bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT; $bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
$facs = array(); $facs = array();
$amounts = array(); $amounts = array();
$facs = $this->_get_list_factures(); $facs = $this->_get_list_factures();
for ($i = 0 ; $i < sizeof($facs) ; $i++) for ($i = 0 ; $i < sizeof($facs) ; $i++)
{ {
$fac = new Facture($this->db); $fac = new Facture($this->db);
$fac->fetch($facs[$i]); $fac->fetch($facs[$i]);
$amounts[$fac->id] = $fac->total_ttc; $amounts[$fac->id] = $fac->total_ttc;
//$result = $fac->set_paid($user); //TODO: Uncomment next line if invoice must have payed status
//$result = $fac->set_paid($user);
} }
$paiement = new Paiement($this->db); $paiement = new Paiement($this->db);
$paiement->datepaye = $date ;//$this->date_credit; $paiement->datepaye = $date ;
$paiement->amounts = $amounts; $paiement->amounts = $amounts;
$paiement->paiementid = 3; // $paiement->paiementid = 3; //
$paiement->num_paiement = $this->ref ; $paiement->num_paiement = $this->ref ;
$paiement_id = $paiement->create($user); $paiement_id = $paiement->create($user);
if ($paiement_id < 0) if ($paiement_id < 0)
{ {
dol_syslog("BonPrelevement::set_credite Erreur 1"); dol_syslog("BonPrelevement::set_credite Erreur 1");
$error++; $error++;
} }
$result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount); $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
if ($result < 0) if ($result < 0)
{ {
dol_syslog("BonPrelevement::set_credite Erreur 1"); dol_syslog("BonPrelevement::set_credite Erreur 1");
$error++; $error++;
} }
// Update prelevement line // Update prelevement line
// TODO: Translate to ligne-prelevement.class.php // TODO: Translate to ligne-prelevement.class.php
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes"; $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
$sql.= " SET statut = 2"; $sql.= " SET statut = 2";
$sql.= " WHERE fk_prelevement_bons = ".$this->id; $sql.= " WHERE fk_prelevement_bons = ".$this->id;
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_syslog("BonPrelevement::set_credite Erreur 1"); dol_syslog("BonPrelevement::set_credite Erreur 1");
$error++; $error++;
} }
} }
else else
{ {
dol_syslog("BonPrelevement::set_infocredit Erreur 1"); dol_syslog("BonPrelevement::set_infocredit Erreur 1");
$error++; $error++;
} }
/* /*
* Fin de la procedure * End of procedure
* *
*/ */
if ($error == 0) if ($error == 0)
{ {
$this->db->commit(); $this->db->commit();
return 0; return 0;
} }
else else
{ {
$this->db->rollback(); $this->db->rollback();
dol_syslog("bon-prelevment::set_infocredit ROLLBACK "); dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
return -1; return -1;
} }
} }
else else
{ {
dol_syslog("bon-prelevement::set_infocredit Ouverture transaction SQL impossible "); dol_syslog("bon-prelevement::set_infocredit Ouverture transaction SQL impossible ");
return -1025; return -1025;
} }
} }
else else
{ {
dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans "); dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
return -1027; return -1027;
} }
} }
else else
{ {
return -1026; return -1026;
} }
} }
/** /**
* Set withdrawal to transmited status * Set withdrawal to transmited status
@ -533,18 +533,10 @@ class BonPrelevement extends CommonObject
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->method_trans = $method; $this->method_trans = $method;
$langs->load('withdrawals');
/*$subject = "Transmission du prelevement ".$this->ref." a la banque"; $subject = $langs->trans("InfoTransSubject", $this->ref);
$message = "Le bon de prelevement ".$this->ref; $message = $langs->trans("InfoTransMessage", $this->ref, $user->prenom, $user->nom);
$message .= " a ete transmis a la banque par ".$user->prenom. " ".$user->nom; $message .=$langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date,'day'));
$message .= "\n\n";
$message .= "\nMontant : ".price($this->amount);
$message .= "\nMethode : ".$this->methodes_trans[$this->method_trans];
$message .= "\nDate : ".dol_print_date($date,'day');*/
$langs->load('withdrawals');
$subject = $langs->trans("InfoTransSubject", $this->ref);
$message = $langs->trans("InfoTransMessage", $this->ref, $user->prenom, $user->nom);
$message .=$langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date,'day'));
$this->Notify($user,"tr", $subject, $message, 1); $this->Notify($user,"tr", $subject, $message, 1);
} }
@ -556,7 +548,7 @@ class BonPrelevement extends CommonObject
} }
/* /*
* Fin de la procedure * End of procedure
* *
*/ */
@ -690,8 +682,8 @@ class BonPrelevement extends CommonObject
} }
/** /**
* * Returns amount of withdrawal
* * @return double total amount
*/ */
function SommeAPrelever() function SommeAPrelever()
{ {
@ -982,7 +974,7 @@ class BonPrelevement extends CommonObject
} }
/* /*
* * Creation process
* *
*/ */
if (!$error) if (!$error)
@ -994,6 +986,18 @@ class BonPrelevement extends CommonObject
// Fetch invoice // Fetch invoice
$fact = new Facture($this->db); $fact = new Facture($this->db);
$fact->fetch($fac[0]); $fact->fetch($fac[0]);
/*
* Add standing order
*
*
* $fac[3] : banque
* $fac[4] : guichet
* $fac[5] : number
* $fac[6] : cle rib
* $fac[7] : amount
* $fac[8] : client nom
* $fac[2] : client id
*/
$ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7],
$fac[3], $fac[4], $fac[5], $fac[6]); $fac[3], $fac[4], $fac[5], $fac[6]);
if ($ri <> 0) if ($ri <> 0)