From b1a1e82c97a1e60ec76d6e07d823b64076d107ec Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 9 Jun 2010 16:51:11 +0000 Subject: [PATCH] Trad: Standing orders --- .../class/ligne-prelevement.class.php | 5 +- .../class/rejet-prelevement.class.php | 5 +- htdocs/compta/prelevement/fiche.php | 6 ++- htdocs/compta/prelevement/ligne.php | 49 +++++++++++++------ htdocs/compta/prelevement/stats.php | 9 ++-- htdocs/langs/ca_ES/main.lang | 2 +- htdocs/langs/ca_ES/withdrawals.lang | 32 ++++++++++-- htdocs/langs/en_US/withdrawals.lang | 26 ++++++++++ htdocs/langs/es_ES/main.lang | 6 +-- htdocs/langs/es_ES/withdrawals.lang | 32 ++++++++++-- htdocs/langs/fr_FR/withdrawals.lang | 28 ++++++++++- 11 files changed, 164 insertions(+), 36 deletions(-) diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php index 91a6b8ab90e..b468465ffc4 100644 --- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php +++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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 b0bb632ec1c..bb8fff507ad 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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 0bbc963e22d..01267567c05 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2009 Laurent Destailleur + * Copyright (C) 2010 Juanjo Menent * * 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 ''; print ''; print ''; - print ''; - print ''; print ''; - print ''; + print '
Date Transmission'; + print '
'.$langs->trans("TransData").''; print $html->select_date('','','','','',"userfile"); print '
Methode Transmission'; + print '
'.$langs->trans("TransMetod").''; print $html->select_array("methode",$bon->methodes_trans); print '
'.$langs->trans("File").''; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 575c6498eaa..fc96c0892ee 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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 '
Motif du rejet'.$rej->motif.'
Date du rejet'; + print '
M'.$langs->trans("RefusedReason").''.$rej->motif.'
'.$langs->trans("RefusedData").''; 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 '
'; print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; + print ''; - print ''; + print ''; print ''; print '
Rejet de pr�l�vement
Etes-vous s�r de vouloir saisir un rejet de pr�l�vement pour la soci�t� '.$soc->nom.' ?
'.$langs->trans("WithdrawalRefused").'
'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?'; print ''; print '
Date du rejet
'.$langs->trans("RefusedData").''; print $html->select_date('','','','','',"confirm_rejet"); print '
Motif du rejet
'.$langs->trans("RefusedReason").''; print ''; print ''; - print '
Facturation du rejet
'.$langs->trans("RefusedInvoicing").''; print ''; print '
'; @@ -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\n"; print ''; @@ -295,7 +314,7 @@ if ($_GET["id"]) if ($bon->credite == 1 && $lipre->statut == 2) { - print "id\">".$langs->trans("Emmetre un rejet").""; + print "id\">".$langs->trans("StandingOrderReject").""; } } diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 548ba0a368b..9cc0d75a560 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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 908903b1ad6..5f16a58f3ae 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 0c5686689cf..53f9da2df90 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 e270dc8934e..c90f7ed0a2c 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 3c88221a8d3..86d5c491258 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 d93c3ec708b..d6780a19801 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 5f04f1422b4..c77de4f945f 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