From e0325f3df166ffa040b3cfdf4a1a10b831f408fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 31 Jul 2012 00:36:42 +0200 Subject: [PATCH 1/7] Missing es_ES translations --- htdocs/langs/es_ES/boxes.lang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index c0000c1f01b..b4e3056673a 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -52,6 +52,7 @@ BoxTitleLastActionsToDo=Los %s últimos eventos a realizar BoxTitleLastContracts=Los %s últimos contratos BoxTitleLastModifiedDonations=Las %s últimas donaciones modificadas BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados +BoxTitleLatestSupplierOrders=Las %s últimas órdenes de pedido de proveedores FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s LastRefreshDate=Fecha última actualización NoRecordedBookmarks=No hay marcadores personales. @@ -69,4 +70,5 @@ NoModifiedSupplierBills=Sin facturas de proveedores modificadas NoRecordedProducts=Sin productos/servicios registrados NoRecordedProspects=Sin clientes potenciales registrados NoContractedProducts=Sin productos/servicios contratados -NoRecordedContracts=Sin contratos registrados \ No newline at end of file +NoRecordedContracts=Sin contratos registrados +NoSupplierOrder=Sin órdenes de pedido de proveedores \ No newline at end of file From fc012a394c3f63662d37dc642a89279da2d79515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 31 Jul 2012 00:44:55 +0200 Subject: [PATCH 2/7] Duplicated space --- htdocs/langs/es_ES/boxes.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index b4e3056673a..c1db2198579 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -53,7 +53,7 @@ BoxTitleLastContracts=Los %s últimos contratos BoxTitleLastModifiedDonations=Las %s últimas donaciones modificadas BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados BoxTitleLatestSupplierOrders=Las %s últimas órdenes de pedido de proveedores -FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s +FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s LastRefreshDate=Fecha última actualización NoRecordedBookmarks=No hay marcadores personales. ClickToAdd=Haga clic aquí para añadir. From 3520513c6bed3c5be4aa06bcdd1e5fe502346c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 31 Jul 2012 00:53:05 +0200 Subject: [PATCH 3/7] Fixed an error that I introduced in a previous commit... --- htdocs/core/modules/modMailmanSpip.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php index d122a4bb9dc..e56057bd334 100644 --- a/htdocs/core/modules/modMailmanSpip.class.php +++ b/htdocs/core/modules/modMailmanSpip.class.php @@ -63,6 +63,12 @@ class modMailmanSpip extends DolibarrModules // Config pages $this->config_page_url = array('mailman.php@adherents'); + + // Constants + $this->const = array(); + $this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman"); + $this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman"); + $this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to"); // Boxes $this->boxes = array(); From c62ac71e031a1d6940f1ddec275e994ab96a7179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 31 Jul 2012 01:05:03 +0200 Subject: [PATCH 4/7] Typo in es_ES translation --- htdocs/langs/es_ES/ecm.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang index 2a15ce63dd8..b61e954edd7 100644 --- a/htdocs/langs/es_ES/ecm.lang +++ b/htdocs/langs/es_ES/ecm.lang @@ -13,7 +13,7 @@ ECMNbOfDocs=Nº de documentos ECMNbOfDocsSmall=Nº Docs. ECMSection=Directorio ECMSectionManual=Directorio manual -ECMSectionAuto=Directorio automática +ECMSectionAuto=Directorio automático ECMSectionsManual=Árbol manual ECMSectionsAuto=Árbol automático ECMSections=Directorios From dbe2fa55df6de24f7ef011a4e57e9bd8ef5b8620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 31 Jul 2012 01:18:32 +0200 Subject: [PATCH 5/7] es_ES translation typo --- htdocs/langs/es_ES/members.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang index dc09d944173..8db3b80893c 100644 --- a/htdocs/langs/es_ES/members.lang +++ b/htdocs/langs/es_ES/members.lang @@ -120,7 +120,7 @@ ExportDataset_member_1=Miembros y afiliaciones ImportDataset_member_1=Miembros LastMembers=Los %s últimos miembros LastMembersModified=Los %s últimos miembros modificados -LastSubscriptionsModified=Lass %s últimas afiliaciones modificadas +LastSubscriptionsModified=Las %s últimas afiliaciones modificadas AttributeName=Nombre del atributo FieldEdition=Edición del campo %s String=Cadena From 2eb38ac8c8f26335cda5940e08cb460e4d8188c1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 31 Jul 2012 08:43:45 +0200 Subject: [PATCH 6/7] Fix: uniformize test --- dev/codesniffer/jenkins_ruleset.xml | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml index a43e9cdf7bf..48a8c363e5e 100755 --- a/dev/codesniffer/jenkins_ruleset.xml +++ b/dev/codesniffer/jenkins_ruleset.xml @@ -75,8 +75,13 @@ 0 - + + 0 + + + 0 + + 0 @@ -84,7 +89,7 @@ - + @@ -103,7 +108,10 @@ - + + 0 + + @@ -116,6 +124,10 @@ + + 0 + + @@ -194,11 +206,15 @@ 0 + 0 + + 0 + 0 @@ -212,8 +228,8 @@ - - + --> From 8d031900f939f264f5f8fa364b29a49ee0e9ab75 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Jul 2012 13:40:38 +0200 Subject: [PATCH 7/7] [ bug #464 ] Payment form should allow to add transmitter for bank transfers --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 8a2d1f257f0..195f041b30e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -263,7 +263,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie { var code = $("#selectpaiementcode option:selected").val(); - if (code == \'CHQ\') + if (code == \'CHQ\' || code == \'VIR\') { $(\'.fieldrequireddyn\').addClass(\'fieldrequired\'); if ($(\'#fieldchqemetteur\').val() == \'\')