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

Withdrawals: Improvements

Browse Source
This commit is contained in:
Juanjo Menent 2011-02-01 20:58:37 +00:00
parent 46abd502e6
commit 9e3694640f
7 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,17 +441,18 @@ class BonPrelevement extends CommonObject
$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 AddPayment Error");
$error++; $error++;
} }
else
{
$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 AddPaymentToBank Error");
$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";
@ -460,14 +461,14 @@ class BonPrelevement extends CommonObject
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_syslog("BonPrelevement::set_credite Erreur 1"); dol_syslog("BonPrelevement::set_credite Update lines Error");
$error++; $error++;
} }
} }
else else
{ {
dol_syslog("BonPrelevement::set_infocredit Erreur 1"); dol_syslog("BonPrelevement::set_infocredit Update Bons Error");
$error++; $error++;
} }
@ -489,7 +490,7 @@ class BonPrelevement extends CommonObject
} }
else else
{ {
dol_syslog("bon-prelevement::set_infocredit Ouverture transaction SQL impossible "); dol_syslog("bon-prelevement::set_infocredit 1025 Open SQL transaction impossible ");
return -1025; return -1025;
} }
} }

15
htdocs/compta/prelevement/class/rejet-prelevement.class.php
View File

@ -138,17 +138,19 @@ class RejetPrelevement
$pai->amounts[$facs[$i]] = price2num($fac->total_ttc * -1); $pai->amounts[$facs[$i]] = price2num($fac->total_ttc * -1);
$pai->datepaye = $date_rejet; $pai->datepaye = $date_rejet;
$pai->paiementid = 3; // type of payment: withdrawal $pai->paiementid = 3; // type of payment: withdrawal
$pai->num_paiement = $langs->trans("StatusRefused"); $pai->num_paiement = $fac->ref;
if ($pai->create($this->user) == -1) // we call with no_commit if ($pai->create($this->user) < 0) // we call with no_commit
{ {
$error++; $error++;
dol_syslog("RejetPrelevement::Create Erreur creation paiement facture ".$facs[$i]); dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i]);
} }
$result=$pai->addPaymentToBank($user,'payment','(WithdrawalRefused)',$bankaccount); else
{
$result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount);
if ($result < 0) if ($result < 0)
{ {
dol_syslog("RejetPrelevement::Create bank Transaction Error"); dol_syslog("RejetPrelevement::Create AddPaymentToBan Error");
$error++; $error++;
} }
@ -156,9 +158,10 @@ class RejetPrelevement
if ($pai->valide() < 0) if ($pai->valide() < 0)
{ {
$error++; $error++;
dol_syslog("RejetPrelevement::Create Erreur validation du paiement"); dol_syslog("RejetPrelevement::Create Error payment validation");
} }
}
//Tag invoice as unpaid //Tag invoice as unpaid
dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref); dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
$fac->set_unpaid($fac->id, $user); $fac->set_unpaid($fac->id, $user);

3
htdocs/langs/ca_ES/withdrawals.lang
View File

@ -41,7 +41,8 @@ TransMetod=Mètode enviament
Send=Enviar Send=Enviar
Lines=línies Lines=línies
StandingOrderReject=Emetre una devolució StandingOrderReject=Emetre una devolució
WithdrawalRefused=Devolucions de domiciliacions InvoiceRefused=Factura tornada
WithdrawalRefused=Devolució de domiciliació
WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa
RefusedData=Data de devolució RefusedData=Data de devolució
RefusedReason=Motiu de devolució RefusedReason=Motiu de devolució

3
htdocs/langs/en_US/withdrawals.lang
View File

@ -41,7 +41,8 @@ TransMetod=Method Transmission
Send=Send Send=Send
Lines=Lines Lines=Lines
StandingOrderReject=Issue a reject StandingOrderReject=Issue a reject
WithdrawalRefused=Withdrawals Refuseds InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal Refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection RefusedData=Date of rejection
RefusedReason=Reason for rejection RefusedReason=Reason for rejection

3
htdocs/langs/es_AR/withdrawals.lang
View File

@ -41,7 +41,8 @@ TransMetod=Método envío
Send=Enviar Send=Enviar
Lines=Líneas Lines=Líneas
StandingOrderReject=Emitir una devolución StandingOrderReject=Emitir una devolución
WithdrawalRefused=Devoluciones de domiciliaciones InvoiceRefused=Factura devuelta
WithdrawalRefused=Devolución de domiciliación
WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa
RefusedData=Fecha de devolución RefusedData=Fecha de devolución
RefusedReason=Motivo de devolución RefusedReason=Motivo de devolución

3
htdocs/langs/es_ES/withdrawals.lang
View File

@ -41,7 +41,8 @@ TransMetod=Método envío
Send=Enviar Send=Enviar
Lines=Líneas Lines=Líneas
StandingOrderReject=Emitir una devolución StandingOrderReject=Emitir una devolución
WithdrawalRefused=Devoluciones de domiciliaciones InvoiceRefused=Factura devuelta
WithdrawalRefused=Devolución de domiciliación
WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa
RefusedData=Fecha de devolución RefusedData=Fecha de devolución
RefusedReason=Motivo de devolución RefusedReason=Motivo de devolución

3
htdocs/langs/fr_FR/withdrawals.lang
View File

@ -41,7 +41,8 @@ TransMetod=Méthode Transmission
Send=Envoyer Send=Envoyer
Lines=Lignes Lines=Lignes
StandingOrderReject=Emmètre un rejet StandingOrderReject=Emmètre un rejet
WithdrawalRefused=Rejet de prélèvements InvoiceRefused=Facture rejeté
WithdrawalRefused=Rejet de prélèvement
WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir saisir un rejet de prélèvement pour la société WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir saisir un rejet de prélèvement pour la société
RefusedData=Date du rejet RefusedData=Date du rejet
RefusedReason=Motif du rejet RefusedReason=Motif du rejet