diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml
index a43e9cdf7bf53cf601788bb7ec5a6c901d3abbf9..48a8c363e5e7b6f176a499ef5fd1dd395b360dd5 100755
--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -75,8 +75,13 @@
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
<severity>0</severity>
</rule>
- <rule
- ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+ <rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
+ <severity>0</severity>
+ </rule>
+ <rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
+ <severity>0</severity>
+ </rule>
+ <rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
<severity>0</severity>
</rule>
@@ -84,7 +89,7 @@
<rule ref="Generic.Metrics.CyclomaticComplexity">
<properties>
<property name="complexity" value="80" />
- <property name="absoluteComplexity" value="100" />
+ <property name="absoluteComplexity" value="200" />
</properties>
</rule>
<rule ref="Generic.Metrics.NestingLevel">
@@ -103,7 +108,10 @@
<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
<rule ref="Generic.PHP.DeprecatedFunctions" />
-
+ <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
+ <severity>0</severity>
+ </rule>
+
<rule ref="Generic.PHP.DisallowShortOpenTag" />
<rule ref="Generic.PHP.ForbiddenFunctions" />
@@ -116,6 +124,10 @@
<rule ref="Generic.Strings.UnnecessaryStringConcat" />
+ <rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
+ <severity>0</severity>
+ </rule>
+
<rule ref="Generic.VersionControl.SubversionProperties" />
<!-- Disallow usage of tab -->
@@ -194,11 +206,15 @@
<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
<severity>0</severity>
</rule>
+
<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
<severity>0</severity>
</rule>
<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+ <rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
+ <severity>0</severity>
+ </rule>
<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
<severity>0</severity>
</rule>
@@ -212,8 +228,8 @@
<rule ref="PEAR.NamingConventions.ValidVariableName" />
<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
-
- <!--
+
+ <!-- Need to be commented to be disabled
<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
<severity>0</severity>
</rule>
@@ -221,8 +237,7 @@
<rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
<severity>0</severity>
</rule>
-
- -->
+ -->
<!-- Already found as a Generic rule -->
<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 8a2d1f257f049d71366e37ddc57c10f81904264b..195f041b30ec177568fe340246f30905eac2c031 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() == \'\')
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index d122a4bb9dc7827786e68aec24519e9f65321e1e..e56057bd3349e1802aa8f2f6a90ce137f84cdae7 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();
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index c0000c1f01b51fd09b394fe9ba797b9e20d055b0..c1db2198579e69c02690959f7f987fb941eb5125 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -52,7 +52,8 @@ BoxTitleLastActionsToDo=Los %s últimos eventos a realizar
BoxTitleLastContracts=Los %s últimos contratos
BoxTitleLastModifiedDonations=Las %s últimas donaciones modificadas
BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados
-FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s
+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.
ClickToAdd=Haga clic aquí para añadir.
@@ -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
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index 2a15ce63dd80b41b8718e8f2931c8270a1e303ef..b61e954edd7b2dab8725008d575d113b81fce15b 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
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index dc09d944173914310da9b9ab740a179f3f6fdb36..8db3b80893cebaecd6a7f84929f4cc876cd548b9 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