diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index 91a6b8ab90ed8ce356ab1f2f5d56924ad785968c..b468465ffc4180e380f8d16ae9a206324be9c404 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -51,9 +52,9 @@ class LignePrelevement
$this->user = $user;
// List of language codes for status
- $this->statuts[0] = "Waiting";
+ /*$this->statuts[0] = "Waiting";
$this->statuts[2] = "Credited";
- $this->statuts[3] = "Refused";
+ $this->statuts[3] = "Refused";*/
}
/**
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index b0bb632ec1c87ca4841dcab749e2f6955290cc98..bb8fff507ad5b6c83486656800473ef798d32c0f 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,7 +50,7 @@ class RejetPrelevement
$this->user = $user;
$this->motifs = array();
- $this->motifs[0] = "Non renseigne";
+ /* $this->motifs[0] = "Non renseigne";
$this->motifs[1] = "Provision insuffisante";
$this->motifs[2] = "Tirage conteste";
$this->motifs[3] = "Pas de bon � payer";
@@ -57,7 +58,7 @@ class RejetPrelevement
$this->motifs[5] = "RIB inexploitable";
$this->motifs[6] = "Compte solde";
$this->motifs[7] = "Decision judiciaire";
- $this->motifs[8] = "Autre motif";
+ $this->motifs[8] = "Autre motif";*/
}
function create($user, $id, $motif, $date_rejet, $bonid, $facturation=0)
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 0bbc963e22dad419129450dcc13fd0c8dd99da44..01267567c05d2306a107fd6e1934d026a31a753f 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -1,6 +1,7 @@
<?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,6 +33,7 @@ accessforbidden();
$langs->load("bills");
$langs->load("withdrawals");
+$langs->load("main");
// Security check
@@ -201,10 +203,10 @@ if ($_GET["id"])
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="infotrans">';
print '<table class="border" width="100%">';
- print '<tr><td width="20%">Date Transmission</td><td>';
+ print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
print $html->select_date('','','','','',"userfile");
print '</td></tr>';
- print '<tr><td width="20%">Methode Transmission</td><td>';
+ print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $html->select_array("methode",$bon->methodes_trans);
print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 575c6498eaae92d3379422fef35bc7ef94be0d95..fc96c0892ee6c8f03364da136ed437880ef82dcd 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,6 +35,10 @@ require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
// Security check
if ($user->societe_id > 0) accessforbidden();
+$langs->load("bills");
+$langs->load("withdrawals");
+$langs->load("main");
+
if ($_POST["action"] == 'confirm_rejet')
{
@@ -87,6 +92,10 @@ $h++;
if ($_GET["id"])
{
$lipre = new LignePrelevement($db, $user);
+
+ $lipre->statuts[0] = $langs->trans("StatusWaiting");
+ $lipre->statuts[2] = $langs->trans("StatusCredited");
+ $lipre->statuts[3] = $langs->trans("StatusRefused");
if ($lipre->fetch($_GET["id"]) == 0)
{
@@ -110,8 +119,8 @@ if ($_GET["id"])
$resf = $rej->fetch($lipre->id);
if ($resf == 0)
{
- print '<tr><td width="20%">Motif du rejet</td><td>'.$rej->motif.'</td></tr>';
- print '<tr><td width="20%">Date du rejet</td><td>';
+ print '<tr><td width="20%">M'.$langs->trans("RefusedReason").'</td><td>'.$rej->motif.'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("RefusedData").'</td><td>';
if ($rej->date_rejet == 0)
{
/* Historique pour certaines install */
@@ -147,28 +156,38 @@ if ($_GET["id"])
$soc->fetch($lipre->socid);
$rej = new RejetPrelevement($db, $user);
+
+ $rej->motifs[0] = $langs->trans("StatusMotif0");
+ $rej->motifs[1] = $langs->trans("StatusMotif1");
+ $rej->motifs[2] = $langs->trans("StatusMotif2");
+ $rej->motifs[3] = $langs->trans("StatusMotif3");
+ $rej->motifs[4] = $langs->trans("StatusMotif4");
+ $rej->motifs[5] = $langs->trans("StatusMotif5");
+ $rej->motifs[6] = $langs->trans("StatusMotif6");
+ $rej->motifs[7] = $langs->trans("StatusMotif7");
+ $rej->motifs[8] = $langs->trans("StatusMotif8");
print '<form name="confirm_rejet" method="post" action="ligne.php?id='.$_GET["id"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="confirm_rejet">';
print '<table class="border" width="100%">';
- print '<tr><td colspan="3">Rejet de pr�l�vement</td></tr>';
- print '<tr><td class="valid">Etes-vous s�r de vouloir saisir un rejet de pr�l�vement pour la soci�t� '.$soc->nom.' ?</td>';
+ print '<tr><td colspan="3">'.$langs->trans("WithdrawalRefused").'</td></tr>';
+ print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?</td>';
print '<td colspan="2" class="valid">';
print '<select name="confirm">';
- print '<option value="yes">oui</option>';
- print '<option value="no" selected="true">non</option>';
+ print '<option value="yes">'.$langs->trans("Yes").'</option>';
+ print '<option value="no" selected="true">'.$langs->trans("No").'</option>';
print '</select>';
print '</td></tr>';
- print '<tr><td class="valid">Date du rejet</td>';
+ print '<tr><td class="valid">'.$langs->trans("RefusedData").'</td>';
print '<td colspan="2" class="valid">';
print $html->select_date('','','','','',"confirm_rejet");
print '</td></tr>';
- print '<tr><td class="valid">Motif du rejet</td>';
+ print '<tr><td class="valid">'.$langs->trans("RefusedReason").'</td>';
print '<td class="valid">';
print '<select name="motif">';
- print '<option value="0">(Motif du Rejet)</option>';
+ print '<option value="0">('.$langs->trans("RefusedReason").')</option>';
foreach($rej->motifs as $key => $value)
{
@@ -177,13 +196,13 @@ if ($_GET["id"])
print '</select>';
print '</td>';
print '<td class="valid" align="center">';
- print '<input type="submit" value="Confirmer"></td></tr>';
+ print '<input type="submit" value='.$langs->trans("Confirm").'></td></tr>';
- print '<tr><td class="valid">Facturation du rejet</td>';
+ print '<tr><td class="valid">'.$langs->trans("RefusedInvoicing").'</td>';
print '<td class="valid" colspan="2">';
print '<select name="facturer">';
- print '<option value="0">Ne Pas Facturer le rejet</option>';
- print '<option value="1">Facturer le rejet au client</option>';
+ print '<option value="0">'.$langs->trans("NoInvoiceRefused").'</option>';
+ print '<option value="1">'.$langs->trans("InvoiceRefused").'</option>';
print '</select>';
print '</td>';
print '</table></form>';
@@ -234,7 +253,7 @@ if ($_GET["id"])
$urladd = "&id=".$_GET["id"];
- print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, 0, '');
+ print_barre_liste($langs->trans("Bills"), $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, 0, '');
print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -295,7 +314,7 @@ if ($_GET["id"])
if ($bon->credite == 1 && $lipre->statut == 2)
{
- print "<a class=\"butAction\" href=\"ligne.php?action=rejet&id=$lipre->id\">".$langs->trans("Emmetre un rejet")."</a>";
+ print "<a class=\"butAction\" href=\"ligne.php?action=rejet&id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
}
}
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 548ba0a368beee4a3d5ff28e6d5c832ef2691486..9cc0d75a560d465aee764404c44863c0f0389677 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -87,10 +88,10 @@ if ($db->query($sql))
$var=True;
- $st[0] = "Wainting";
- $st[1] = "Wainting";
- $st[2] = "Credited";
- $st[3] = "Rejected";
+ $st[0] = $langs->trans("StatusWaiting");
+ $st[1] = $langs->trans("StatusWaiting");
+ $st[2] = $langs->trans("StatusCredited");
+ $st[3] = $langs->trans("StatusRefused");
while ($i < $num)
{
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 908903b1ad61be69b76a085dd700c62098013cc5..5f16a58f3aebe4d31b08d7de809c01d5e9194473 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -369,7 +369,7 @@ ByUsers=Per usuari
Links=Links
Link=Link
Receipts=Rebuts
-Rejects=Rebutjat
+Rejects=Devolucions
Preview=Vista prèvia
NextStep=Següent pas
PreviousStep=Pas anterior
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 0c5686689cf046a90b95462c43b08c4c4423c89b..53f9da2df903b003b90692ed8ab695171a54a882 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -12,7 +12,7 @@ Withdrawal=Reintegrament
WithdrawalsReceipts=Ordres domiciliades
WithdrawalReceipt=Ordre domiciliació
WithdrawalReceiptShort=Ordre
-LastWithdrawalReceipts=Les %s últimes ordres de procés
+LastWithdrawalReceipts=Les %s últimes ordres de domiciliacions
WithdrawedBills=Factures domiciliades
WithdrawalsLines=Línies de domiciliació
RequestStandingOrderToTreat=Comandes de domiciliacions a tractar
@@ -33,5 +33,31 @@ MakeWithdrawRequest=Fer una petició de domiciliació
ThirdPartyBankCode=Codi banc del tercer
ThirdPartyDeskCode=Codi oficina del tercer
NoInvoiceCouldBeWithdrawed=Cap factura domiciliats, domiciliació amb èxit. Assegureu-vos que les factures són d'empreses amb les dades de comptes bancaris correctes.
-ClassCredited=Classificar acreditats
-ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com realitzada sobre el seu compte bancari?
+ClassCredited=Classificar com abonada
+ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
+TransData=Data enviament
+TransMetod=Mètode enviament
+Send=Enviar
+Lines=línies
+StandingOrderReject=Emetre una devolució
+WithdrawalRefused=Devolucions de domiciliacions
+WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa
+RefusedData=Data de devolució
+RefusedReason=Motiu de devolució
+RefusedInvoicing=Facturació de la devolució
+NoInvoiceRefused=No facturar la devolució
+InvoiceRefused=Facturar la devolució al client
+StatusWaiting=En espera
+StatusCredited=Abonada
+StatusRefused=Tornada
+StatusMotif0=No especificat
+StatusMotif1=Provisió insuficient
+StatusMotif2=Ordre del client
+StatusMotif3=Sense ordre de domiciliació
+StatusMotif4=Compte bloquejat
+StatusMotif5=Compte inexistent
+StatusMotif6=Compte sense saldo
+StatusMotif7=Decisió judicial
+StatusMotif8=Altre motiu
+CreateGuichet=Només Oficina
+CreateBanque=Només Banc
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index e270dc8934ebb6322ea46f1a3fde511897a2f1df..c90f7ed0a2c3c932b14ad73e251a51deaaaeae2c 100755
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -35,3 +35,29 @@ ThirdPartyDeskCode=Third party desk code
NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
ClassCredited=Classify credited
ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account ?
+TransData=Date Transmission
+TransMetod=Method Transmission
+Send=Send
+Lines=Lines
+StandingOrderReject=Issue a reject
+WithdrawalRefused=Withdrawals Refuseds
+WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
+RefusedData=Date of rejection
+RefusedReason=Reason for rejection
+RefusedInvoicing=Billing the rejection
+NoInvoiceRefused=Do not charge the rejection
+InvoiceRefused=Charge the rejection to customer
+StatusWaiting=Waiting
+StatusCredited=Credited
+StatusRefused=Refused
+StatusMotif0=Unspecified
+StatusMotif1=Provision insuffisante
+StatusMotif2=Tirage conteste
+StatusMotif3=No Withdrawal order
+StatusMotif4=Customer Order
+StatusMotif5=RIB inexploitable
+StatusMotif6=Account without balance
+StatusMotif7=Judicial Decision
+StatusMotif8=Other reason
+CreateGuichet=Only Office
+CreateBanque=only Bank
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 3c88221a8d36f4b3939e5d805258ae1685e200ee..86d5c491258e9f92d7d554ffc8b91d551b648e45 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_ES - main
+Dolibarr language file - es_ES - main
CHARSET=UTF-8
DIRECTION=ltr
SeparatorDecimal=,
@@ -369,7 +369,7 @@ ByUsers=Por usuario
Links=Links
Link=Link
Receipts=Recibos
-Rejects=Rechazado
+Rejects=Devoluciones
Preview=Vista previa
NextStep=Siguiente paso
PreviousStep=Paso anterior
@@ -478,7 +478,7 @@ Undo=Anular
Redo=Rehacer
ExpandAll=Expandir todo
UndoExpandAll=Anular expansión
-Reason=Razon
+Reason=Razón
FeatureNotYetSupported=Funcionalidad aún no soportada
CloseWindow=Cerrar ventana
Question=Pregunta
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index d93c3ec708bd8900b99eb3d9b4cf86590eb74291..d6780a19801892537bc28969c3a5f187a8bf9347 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -12,7 +12,7 @@ Withdrawal=Reintegro
WithdrawalsReceipts=Ordenes domiciliadas
WithdrawalReceipt=Orden domiciliación
WithdrawalReceiptShort=Orden
-LastWithdrawalReceipts=Las %s últimas órdenes de proceso
+LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación
WithdrawedBills=Facturas domiciliadas
WithdrawalsLines=Lineas de domiciliacion
RequestStandingOrderToTreat=Pedidos de domiciliaciones a tratar
@@ -33,5 +33,31 @@ MakeWithdrawRequest=Realizar una petición de domiciliación
ThirdPartyBankCode=Código banco del tercero
ThirdPartyDeskCode=Código oficina del tercero
NoInvoiceCouldBeWithdrawed=Ninguna factura domiciliable, domiciliación con éxito. Asegúrese de que las facturas son de empresas con los datos de cuentas bancarias correctos.
-ClassCredited=Clasificar acreditados
-ClassCreditedConfirm=¿Está seguro de querer clasificar esta domiciliación como realizada sobre su cuenta bancaria?
+ClassCredited=Clasificar como abonada
+ClassCreditedConfirm=¿Está seguro de querer clasificar esta domiciliación como abonada en su cuenta bancaria?
+TransData=Fecha envío
+TransMetod=Método envío
+Send=Enviar
+Lines=Líneas
+StandingOrderReject=Emitir una devolución
+WithdrawalRefused=Devoluciones de domiciliaciones
+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
+RefusedInvoicing=Facturación de la devolución
+NoInvoiceRefused=No facturar la devolución
+InvoiceRefused=Facturar la devolución al cliente
+StatusWaiting=En espera
+StatusCredited=Abonada
+StatusRefused=Devuelta
+StatusMotif0=No especificado
+StatusMotif1=Provisión insuficiente
+StatusMotif2=Orden del cliente
+StatusMotif3=Sin orden de domiciliación
+StatusMotif4=Cuenta bloqueada
+StatusMotif5=Cuenta inexistente
+StatusMotif6=Cuenta sin saldo
+StatusMotif7=Decisión judicial
+StatusMotif8=Otro motivo
+CreateGuichet=Sólo Oficina
+CreateBanque=Sólo Banco
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 5f04f1422b44dd7cc1934bae7530485f4f0700a5..c77de4f945fa6123feb52d099a2b4cc6c92a5959 100755
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -34,4 +34,30 @@ ThirdPartyBankCode=Code banque du tiers
ThirdPartyDeskCode=Code guichet du tiers
NoInvoiceCouldBeWithdrawed=Aucune facture prélevable, prélevée avec succès. Vérifiez que les factures sont sur des sociétés dont le BAN(RIB) est correctement renseigné.
ClassCredited=Classer crédité
-ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
\ No newline at end of file
+ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
+TransData=Date Transmission
+TransMetod=Méthode Transmission
+Send=Envoyer
+Lines=Lignes
+StandingOrderReject=Emmetre un rejet
+WithdrawalRefused=Rejet de prélèvements
+WithdrawalRefusedConfirm=Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société
+RefusedData=Date du rejet
+RefusedReason=Motif du rejet
+RefusedInvoicing=Facturation du rejet
+NoInvoiceRefused=Ne Pas Facturer le rejet
+InvoiceRefused=Facturer le rejet au client
+StatusWaiting=En attente
+StatusCredited=Crédité
+StatusRefused=Rejeté
+StatusMotif0=Non renseigne
+StatusMotif1=Provision insuffisante
+StatusMotif2=Tirage conteste
+StatusMotif3=Pas de bon á payer
+StatusMotif4=Opposition sur compte
+StatusMotif5=RIB inexploitable
+StatusMotif6=Compte solde
+StatusMotif7=Decision judiciaire
+StatusMotif8=Autre motif
+CreateGuichet=Seulement Guichet
+CreateBanque=Seulement Banque
\ No newline at end of file