diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php index 07a024c48b1..e102cfdba28 100644 --- a/htdocs/compta/prelevement/class/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php @@ -441,17 +441,18 @@ class BonPrelevement extends CommonObject $paiement_id = $paiement->create($user); if ($paiement_id < 0) { - dol_syslog("BonPrelevement::set_credite Erreur 1"); + dol_syslog("BonPrelevement::set_credite AddPayment Error"); $error++; } - - $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount); - if ($result < 0) - { - dol_syslog("BonPrelevement::set_credite Erreur 1"); - $error++; - } - + else + { + $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount); + if ($result < 0) + { + dol_syslog("BonPrelevement::set_credite AddPaymentToBank Error"); + $error++; + } + } // Update prelevement line // TODO: Translate to ligne-prelevement.class.php $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes"; @@ -460,14 +461,14 @@ class BonPrelevement extends CommonObject if (! $this->db->query($sql)) { - dol_syslog("BonPrelevement::set_credite Erreur 1"); + dol_syslog("BonPrelevement::set_credite Update lines Error"); $error++; } } else { - dol_syslog("BonPrelevement::set_infocredit Erreur 1"); + dol_syslog("BonPrelevement::set_infocredit Update Bons Error"); $error++; } @@ -489,7 +490,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("bon-prelevement::set_infocredit Ouverture transaction SQL impossible "); + dol_syslog("bon-prelevement::set_infocredit 1025 Open SQL transaction impossible "); return -1025; } } diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php index 9b64888c26d..7fa8af0706a 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -138,27 +138,30 @@ class RejetPrelevement $pai->amounts[$facs[$i]] = price2num($fac->total_ttc * -1); $pai->datepaye = $date_rejet; $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++; - 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); - if ($result < 0) + else { - dol_syslog("RejetPrelevement::Create bank Transaction Error"); - $error++; - } + $result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount); + if ($result < 0) + { + dol_syslog("RejetPrelevement::Create AddPaymentToBan Error"); + $error++; + } + + // Payment validation + if ($pai->valide() < 0) + { + $error++; + dol_syslog("RejetPrelevement::Create Error payment validation"); + } - // Payment validation - if ($pai->valide() < 0) - { - $error++; - dol_syslog("RejetPrelevement::Create Erreur validation du paiement"); } - //Tag invoice as unpaid dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref); $fac->set_unpaid($fac->id, $user); diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index f30a4d36986..66aea272c92 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -41,7 +41,8 @@ TransMetod=Mètode enviament Send=Enviar Lines=línies 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 RefusedData=Data de devolució RefusedReason=Motiu de devolució diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 31dbcc65b0d..460d926d6c3 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -41,7 +41,8 @@ TransMetod=Method Transmission Send=Send Lines=Lines 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 RefusedData=Date of rejection RefusedReason=Reason for rejection diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang index c615306c1bf..626f24a6cdc 100755 --- a/htdocs/langs/es_AR/withdrawals.lang +++ b/htdocs/langs/es_AR/withdrawals.lang @@ -41,7 +41,8 @@ TransMetod=Método envío Send=Enviar Lines=Líneas 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 RefusedData=Fecha de devolución RefusedReason=Motivo de devolución diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index e01d4eabcbf..2b83af31116 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -41,7 +41,8 @@ TransMetod=Método envío Send=Enviar Lines=Líneas 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 RefusedData=Fecha de devolución RefusedReason=Motivo de devolución diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 57ca0baa8b5..cb84d818ae3 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -41,7 +41,8 @@ TransMetod=Méthode Transmission Send=Envoyer Lines=Lignes 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é RefusedData=Date du rejet RefusedReason=Motif du rejet