Withdrawals: Improvements

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++;
 						}
-                		
+                		else 
-						$result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
+                		{
-						if ($result < 0)
+							$result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
-						{
+							if ($result < 0)
-							dol_syslog("BonPrelevement::set_credite Erreur 1");
+							{
-							$error++;
+								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;
 				}
 			}

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);
+			else
-			if ($result < 0)
 			{
-				dol_syslog("RejetPrelevement::Create bank Transaction Error");
+				$result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount);
-				$error++;
+				if ($result < 0)
-			}
+				{
+					dol_syslog("RejetPrelevement::Create AddPaymentToBan Error");
+					$error++;
+				}
 			
-			// Payment validation
+				// Payment validation
-			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
 			dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
 			$fac->set_unpaid($fac->id, $user);

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ó

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

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

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

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