From 6bbcb376b175b6ac1a592680cb8205de3085475f Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 28 Sep 2012 15:55:50 +0200
Subject: [PATCH 1/6] Trad: Add missing translations

---
 htdocs/langs/ca_ES/admin.lang   | 4 +++-
 htdocs/langs/ca_ES/orders.lang  | 2 ++
 htdocs/langs/es_ES/admin.lang   | 5 ++++-
 htdocs/langs/es_ES/holiday.lang | 3 ++-
 htdocs/langs/es_ES/orders.lang  | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index fbf6cf10de2..0a18dbf18ed 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -82,7 +82,7 @@ UserSetup=Configuració gestió dels usuaris
 MenuSetup=Administració dels menús per base de dades
 MenuLimits=Límits i precisió
 MenuIdParent=Id del menú pare
-DetailMenuIdParent=IDr del menú pare (0 per a un menú superior)
+DetailMenuIdParent=IDr del menú pare (buit per a un menú superior)
 DetailPosition=Número d'ordre per a la posició del menú
 PersonalizedMenusNotSupported=Menús personalitzats no generats
 AllMenus=Tots
@@ -1304,6 +1304,8 @@ Sell=Venda
 InvoiceDateUsed=Data utilitzada de factura
 YourCompanyDoesNotUseVAT=La seva empresa està configurada com no subjecta a l'IVA (Inici - Configuració - Empresa/Institució), per la qual cosa no hi ha opció per a la parametrització de l'IVA.
 AccountancyCode=Codi comptable
+AccountancyCodeSell=Codi comptable vendes
+AccountancyCodeBuy=Codi comptable compres
 ##### Agenda #####
 AgendaSetup=Mòdul configuració d'accions i agenda
 PasswordTogetVCalExport=Clau d'autorització vCal export link
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index a5185f4e48f..ef2f9e43efa 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -141,6 +141,8 @@ OrderSource6=Revistes
 QtyOrdered=Qt. demanda
 AddDeliveryCostLine=Afegir una línia de despeses de ports indicant el pes de la comanda
 SetDemandReason=Indicar origen de la comanda
+CreateInvoiceForThisCustomer=Crear una factura a partir de diverses comandes d'aquest client
+CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades.
 
 # Document models
 PDFEinsteinDescription=Model de comanda complet (logo...)
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 58005491211..c05c4c50ea8 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -83,7 +83,7 @@ UserSetup=Configuración gestión de los usuarios
 MenuSetup=Administración de los menús por base de datos
 MenuLimits=Límites y precisión
 MenuIdParent=Id del menú padre
-DetailMenuIdParent=ID del menú padre (0 para un menú superior)
+DetailMenuIdParent=ID del menú padre (vacío para un menú superior)
 DetailPosition=Número de orden para la posición del menú
 PersonalizedMenusNotSupported=Menús personalizados no generados
 AllMenus=Todos
@@ -1308,7 +1308,10 @@ InvoiceDateUsed=Fecha usada de factura
 YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al IVA (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del IVA.
 AccountancyCode=Código contable
 Deductible=Deducible
+AccountancyCodeSell=Código contable ventas
+AccountancyCodeBuy=Código contable compras
 ##### Agenda #####
+
 AgendaSetup=Módulo configuración de acciones y agenda
 PasswordTogetVCalExport=Clave de autorización vcal export link
 PastDelayVCalExport=No exportar los eventos de más de
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 5e8e1f71d07..4d7344cc10c 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -84,7 +84,8 @@ NewSoldeCP=Nuevo saldo
 alreadyCPexist=Ya se ha efectuado una petición de vacaciones para este periodo.
 UserName=Nombre Apellidos
 Employee=Empleado
-
+FirstDayOfHoliday=Primer día libre
+LastDayOfHoliday=Último día libre
 
 ## Configuration du Module ##
 ConfCP=Configuración del módulo Vacaciones
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 70a226023e8..06a662847c6 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -141,6 +141,8 @@ OrderSource6=Revistas
 QtyOrdered=Cant. pedida
 AddDeliveryCostLine=Añadir una línea de gastos de portes indicando el peso del pedido
 SetDemandReason=Indicar origen del pedido
+CreateInvoiceForThisCustomer=Crear una factura a partir de varios pedidos de este cliente
+CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" los pedidos seleccionados.
 
 # Document models
 PDFEinsteinDescription=Modelo de pedido completo (logo...)

From 422f028ac9d4b4c747ccb07b75bdecb33893c846 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 29 Sep 2012 12:07:07 +0200
Subject: [PATCH 2/6] Fix: use ADHERENT_BANK_USE for check or not bank via
 invoice Fix: code optimizing

---
 htdocs/adherents/card_subscriptions.php | 69 +++++++++++--------------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 400e386ef8e..6972f32113d 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
  *
  * 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
@@ -40,6 +41,7 @@ $langs->load("mails");
 
 
 $action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
 $rowid=GETPOST('rowid','int');
 $typeid=GETPOST('typeid','int');
 
@@ -87,7 +89,7 @@ if ($rowid)
  */
 
 // Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $_POST["confirm"] == 'yes' && $user->rights->societe->creer)
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
 {
 	if ($result > 0)
 	{
@@ -589,10 +591,10 @@ if ($rowid)
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans("LinkedToDolibarrUser");
     print '</td>';
-    if ($_GET['action'] != 'editlogin' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a></td>';
+    if ($action != 'editlogin' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a></td>';
     print '</tr></table>';
     print '</td><td class="valeur">';
-    if ($_GET['action'] == 'editlogin')
+    if ($action == 'editlogin')
     {
         /*$include=array();
          if (empty($user->rights->user->user->creer))    // If can edit only itself user, we can link to itself only
@@ -748,49 +750,40 @@ if ($rowid)
         if ($conf->use_javascript_ajax)
         {
             print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
-                        jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice||in_array(GETPOST('paymentsave'),array('bankdirect','bankviainvoice'))?'show()':'hide()').';
-                        jQuery(".bankswitchclass2").'.($bankdirect||$bankviainvoice||in_array(GETPOST('paymentsave'),array('bankdirect','bankviainvoice'))?'show()':'hide()').';
-                        jQuery("#none").click(function() {
-                            jQuery(".bankswitchclass").hide();
-                            jQuery(".bankswitchclass2").hide();
+            print '$(document).ready(function () {
+                        $(".bankswitchclass, .bankswitchclass2").'.($bankdirect||$bankviainvoice||in_array(GETPOST('paymentsave'),array('bankdirect','bankviainvoice'))?'show()':'hide()').';
+                        $("#none, #invoiceonly").click(function() {
+                            $(".bankswitchclass").hide();
+                            $(".bankswitchclass2").hide();
                         });
-                        jQuery("#bankdirect").click(function() {
-                            jQuery(".bankswitchclass").show();
-                            jQuery(".bankswitchclass2").show();
+                        $("#bankdirect, #bankviainvoice").click(function() {
+                            $(".bankswitchclass").show();
+                            $(".bankswitchclass2").show();
                         });
-                        jQuery("#bankviainvoice").click(function() {
-                            jQuery(".bankswitchclass").show();
-                            jQuery(".bankswitchclass2").show();
-                        });
-    	                jQuery("#invoiceonly").click(function() {
-                            jQuery(".bankswitchclass").hide();
-                            jQuery(".bankswitchclass2").hide();
-                        });
-                        jQuery("#selectoperation").change(function() {
-                            code=jQuery("#selectoperation option:selected").val();
-                            if (code == \'CHQ\')
+                        $("#selectoperation").change(function() {
+                            var code = $(this).val();
+                            if (code == "CHQ")
                             {
-                                jQuery(\'.fieldrequireddyn\').addClass(\'fieldrequired\');
-                            	if (jQuery(\'#fieldchqemetteur\').val() == \'\')
+                                $(".fieldrequireddyn").addClass("fieldrequired");
+                            	if ($("#fieldchqemetteur").val() == "")
                             	{
-                                	jQuery(\'#fieldchqemetteur\').val(jQuery(\'#memberlabel\').val());
+                                	$("#fieldchqemetteur").val($("#memberlabel").val());
                             	}
                             }
                             else
                             {
-                                jQuery(\'.fieldrequireddyn\').removeClass(\'fieldrequired\');
+                                $(".fieldrequireddyn").removeClass("fieldrequired");
                             }
                         });
                         ';
-            if (GETPOST('paymentsave')) print 'jQuery("#'.GETPOST('paymentsave').'").attr(\'checked\',true);';
+            if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").attr("checked",true);';
     	    print '});';
             print '</script>'."\n";
         }
 
 
 		// Confirm create third party
-		if ($_GET["action"] == 'create_thirdparty')
+		if ($action == 'create_thirdparty')
 		{
 			$name = $object->getFullName($langs);
 			if (! empty($name))
@@ -803,14 +796,14 @@ if ($rowid)
 			}
 
 			// Create a form array
-			$formquestion=array(			array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
+			$formquestion=array(array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
 
 			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
 			if ($ret == 'html') print '<br>';
 		}
 
 
-        print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<form name="cotisation" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="cotisation">';
         print '<input type="hidden" name="rowid" value="'.$rowid.'">';
@@ -888,15 +881,15 @@ if ($rowid)
                 print '<tr><td valign="top" class="fieldrequired">'.$langs->trans('MoreActions');
                 print '</td>';
                 print '<td>';
-                print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(!$bankdirect&&!$bankviainvoice?' checked="checked"':'').'> '.$langs->trans("None").'<br>';
+                print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($bankviainvoice)?' checked="checked"':'').'> '.$langs->trans("None").'<br>';
                 if (! empty($conf->banque->enabled))
                 {
-                    print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.($bankdirect?' checked="checked"':'');
+                    print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(! empty($bankdirect)?' checked="checked"':'');
                     print '> '.$langs->trans("MoreActionBankDirect").'<br>';
                 }
                 if (! empty($conf->societe->enabled) && ! empty($conf->facture->enabled))
                 {
-                    print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.($invoiceonly?' checked="checked"':'');
+                    print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(empty($conf->global->ADHERENT_BANK_USE) || $invoiceonly?' checked="checked"':'');
                     if (empty($object->fk_soc) || empty($bankviainvoice)) print ' disabled="disabled"';
                     print '> '.$langs->trans("MoreActionInvoiceOnly");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
@@ -911,7 +904,7 @@ if ($rowid)
                 }
                 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled))
                 {
-                    print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.($bankviainvoice?' checked="checked"':'');
+                    print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.($bankviainvoice && !empty($conf->global->ADHERENT_BANK_USE)?' checked="checked"':'');
                     if (empty($object->fk_soc) || empty($bankviainvoice)) print ' disabled="disabled"';
                     print '> '.$langs->trans("MoreActionBankViaInvoice");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';

From d23188c64abc2953e31704e19c2c4ed741d6bad4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 30 Sep 2012 20:49:13 +0200
Subject: [PATCH 3/6] Fix: doxygen

---
 htdocs/compta/facture/class/facture-rec.class.php |  1 +
 htdocs/compta/facture/class/facture.class.php     |  2 ++
 htdocs/core/class/commondocgenerator.class.php    | 11 ++++++-----
 htdocs/core/lib/member.lib.php                    |  3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 95fd10c7068..02c765ba131 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -410,6 +410,7 @@ class FactureRec extends Facture
      *	@param		int			$type				Type of line (0=product, 1=service)
      *	@param      int			$rang               Position of line
      *	@param		int			$special_code		Special code
+     *	@param		string		$label				Label of the line
      *	@return    	int             				<0 if KO, Id of line if OK
 	 */
 	function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='')
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6db8f202fd4..c37e464514b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1880,6 +1880,7 @@ class Facture extends CommonInvoice
      *      @param		int			$fk_parent_line		Id of parent line
      * 		@param		int			$fk_fournprice		To calculate margin
      * 		@param		int			$pa_ht				Buying price of line
+     * 		@param		string		$label				Label of the line
      *    	@return    	int             				<0 if KO, Id of line if OK
      */
     function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='')
@@ -2035,6 +2036,7 @@ class Facture extends CommonInvoice
      * 		@param		int			$skip_update_total	???
      * 		@param		int			$fk_fournprice		To calculate margin
      * 		@param		int			$pa_ht				Buying price of line
+     * 		@param		string		$label				Label of the line
      *      @return    	int             				< 0 if KO, > 0 if OK
      */
     function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='')
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 5007dca817f..bf3e8e98ddf 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -168,13 +168,14 @@ abstract class CommonDocGenerator
 	/**
 	 * Rect pdf
 	 *
-	 * @param unknown_type $pdf
-	 * @param unknown_type $x
-	 * @param unknown_type $y
-	 * @param unknown_type $l
-	 * @param unknown_type $h
+	 * @param	PDF		$pdf			Object PDF
+	 * @param	float	$x				Abscissa of first point
+	 * @param	float	$y		        Ordinate of first point
+	 * @param	float	$l				??
+	 * @param	float	$h				??
 	 * @param	int		$hidetop		Hide top
 	 * @param	int		$hidebottom		Hide bottom
+	 * @return	void
 	 */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 15ada8ed4c0..c3314bb3087 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -103,8 +103,7 @@ function member_prepare_head($object)
 /**
  *  Return array head with list of tabs to view object informations
  *
- *  @param	Object	$object         Member
- *  @return array           		head
+ *  @return	array		head
  */
 function member_admin_prepare_head()
 {

From bcf46d00f0abcd7a2fbec2a8dcddda11105f8f79 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 30 Sep 2012 21:26:58 +0200
Subject: [PATCH 4/6] Fix: convert line delimiters !!

---
 htdocs/adherents/index.php              |  10 +-
 htdocs/adherents/liste.php              |  12 +--
 htdocs/admin/menus/edit.php             |  24 ++---
 htdocs/admin/system/phpinfo.php         |  32 +++---
 htdocs/commande/orderstoinvoice.php     |   8 +-
 htdocs/compta/facture.php               |   4 +-
 htdocs/compta/recap-compta.php          |   2 +-
 htdocs/core/boxes/box_members.php       |  12 +--
 htdocs/core/class/extrafields.class.php |  14 +--
 htdocs/core/lib/usergroups.lib.php      |  30 +++---
 htdocs/fourn/facture/fiche.php          |   4 +-
 htdocs/holiday/admin/holiday.php        |   2 +-
 htdocs/holiday/fiche.php                |   6 +-
 htdocs/holiday/index.php                |   2 +-
 htdocs/holiday/month_report.php         |   2 +-
 htdocs/user/perms.php                   | 132 ++++++++++++------------
 16 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 11acc1914a1..7827abad53a 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -294,12 +294,12 @@ if ($resql)
 			$staticmember->id=$obj->rowid;
 			$staticmember->lastname=$obj->lastname;
 			$staticmember->firstname=$obj->firstname;
-			if (! empty($obj->fk_soc)) {
-				$staticmember->socid = $obj->fk_soc;
+			if (! empty($obj->fk_soc)) {
+				$staticmember->socid = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
-				$staticmember->name=$staticmember->thirdparty->name;
-			} else {
-				$staticmember->name=$obj->company;
+				$staticmember->name=$staticmember->thirdparty->name;
+			} else {
+				$staticmember->name=$obj->company;
 			}
 			$staticmember->ref=$staticmember->getFullName($langs);
 			print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index 4752a36a65a..075510fa915 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -268,12 +268,12 @@ if ($resql)
 		$memberstatic->lastname=$objp->lastname;
 		$memberstatic->firstname=$objp->firstname;
 
-		if (! empty($objp->fk_soc)) {
-			$memberstatic->socid = $objp->fk_soc;
-			$memberstatic->fetch_thirdparty();
-			$companyname=$memberstatic->thirdparty->name;
-		} else {
-			$companyname=$objp->company;
+		if (! empty($objp->fk_soc)) {
+			$memberstatic->socid = $objp->fk_soc;
+			$memberstatic->fetch_thirdparty();
+			$companyname=$memberstatic->thirdparty->name;
+		} else {
+			$companyname=$objp->company;
 		}
 
 		$var=!$var;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index fff20023c05..3e747760544 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -116,18 +116,18 @@ if ($action == 'add')
     $leftmenu=''; $mainmenu='';
     if (! empty($_POST['menuId']) && ! is_numeric($_POST['menuId']))
     {
-	    $tmp=explode('&',$_POST['menuId']);
-	    foreach($tmp as $s)
-	    {
-	    	if (preg_match('/fk_mainmenu=/',$s))
-	    	{
-				$mainmenu=preg_replace('/fk_mainmenu=/','',$s);
-	    	}
-	    	if (preg_match('/fk_leftmenu=/',$s))
-	    	{
-	    		$leftmenu=preg_replace('/fk_leftmenu=/','',$s);
-	    	}
-	    }
+	    $tmp=explode('&',$_POST['menuId']);
+	    foreach($tmp as $s)
+	    {
+	    	if (preg_match('/fk_mainmenu=/',$s))
+	    	{
+				$mainmenu=preg_replace('/fk_mainmenu=/','',$s);
+	    	}
+	    	if (preg_match('/fk_leftmenu=/',$s))
+	    	{
+	    		$leftmenu=preg_replace('/fk_leftmenu=/','',$s);
+	    	}
+	    }
     }
 
     $langs->load("errors");
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 13b7cef0c09..4167f943d32 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load("admin");
 
@@ -40,22 +40,22 @@ llxHeader();
 
 $title='InfoPHP';
 
-if (isset($title))
-{
-	print_fiche_titre($langs->trans($title), '', 'setup');
-}
+if (isset($title))
+{
+	print_fiche_titre($langs->trans($title), '', 'setup');
+}
 
-// Get php_info array
+// Get php_info array
 $phparray=phpinfo_array();
 foreach($phparray as $key => $value)
 {
 	//print_titre($key);
-	print '<table class="noborder">';
-	print '<tr class="liste_titre">';
+	print '<table class="noborder">';
+	print '<tr class="liste_titre">';
 	//print '<td width="220px">'.$langs->trans("Parameter").'</td>';
-	print '<td width="220px">'.$key.'</td>';
-	print '<td colspan="2">'.$langs->trans("Value").'</td>';
-	print "</tr>\n";
+	print '<td width="220px">'.$key.'</td>';
+	print '<td colspan="2">'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
 
 	$var=true;
 	//var_dump($value);
@@ -65,10 +65,10 @@ foreach($phparray as $key => $value)
 		{
 			$var=!$var;
 			print '<tr '.$bc[$var].'>';
-			print '<td>'.$keyparam.'</td>';
+			print '<td>'.$keyparam.'</td>';
 			$valtoshow=$keyvalue;
 			if ($keyparam == 'X-ChromePhp-Data') $valtoshow=dol_trunc($keyvalue,80);
-			print '<td colspan="2">'.$valtoshow.'</td>';
+			print '<td colspan="2">'.$valtoshow.'</td>';
 			print '</tr>';
 		}
 		else
@@ -77,13 +77,13 @@ foreach($phparray as $key => $value)
 			print '<tr '.$bc[$var].'>';
 			print '<td>'.$keyparam.'</td>';
 			$i=0;
-			foreach($keyvalue as $keyparam2 => $keyvalue2)
+			foreach($keyvalue as $keyparam2 => $keyvalue2)
 			{
 				print '<td>';
 				$valtoshow=$keyvalue2;
 				if ($keyparam == 'disable_functions') $valtoshow=join(', ',explode(',',trim($valtoshow)));
 				//print $keyparam2.' = ';
-				print $valtoshow;
+				print $valtoshow;
 				$i++;
 				print '</td>';
 			}
@@ -92,7 +92,7 @@ foreach($phparray as $key => $value)
 	}
 	print '</table><br>';
 }
-
+
 
 llxFooter();
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 60ce5d3b11b..5d9a6b5855a 100755
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -40,12 +40,12 @@ $langs->load('orders');
 $langs->load('deliveries');
 $langs->load('companies');
 
-if (! $user->rights->facture->creer)
+if (! $user->rights->facture->creer)
 	accessforbidden();
 
-$id				= (GETPOST('id')?GETPOST("id"):GETPOST("facid"));  // For backward compatibility
-$ref			= GETPOST('ref','alpha');
-$action			= GETPOST('action','alpha');
+$id				= (GETPOST('id')?GETPOST("id"):GETPOST("facid"));  // For backward compatibility
+$ref			= GETPOST('ref','alpha');
+$action			= GETPOST('action','alpha');
 $confirm		= GETPOST('confirm','alpha');
 $sref			= GETPOST('sref');
 $sref_client	= GETPOST('sref_client');
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 60b9ba8ad4c..18364723a90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1856,8 +1856,8 @@ if ($action == 'create')
     {
         $newinvoice_static->id=$key;
         $newinvoice_static->ref=$valarray['ref'];
-        $newinvoice_static->statut=$valarray['status'];
-        $newinvoice_static->type=$valarray['type'];
+        $newinvoice_static->statut=$valarray['status'];
+        $newinvoice_static->type=$valarray['type'];
         $newinvoice_static->paye=$valarray['paye'];
 
         $optionsav.='<option value="'.$key.'"';
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index e3fcd8db695..d7a2c2fe09a 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -140,7 +140,7 @@ if ($socid > 0)
 
 				print '<td aling="left">'.$fac->getLibStatut(2,$totalpaye).'</td>';
 				print '<td align="right">'.price($fac->total_ttc)."</td>\n";
-				if (($fac->statut == 3 ) || ($fac->statut == 2 && ! $fact->close_code) )  $solde = $solde = $solde + $totalpaye;
+				if (($fac->statut == 3 ) || ($fac->statut == 2 && ! $fact->close_code) )  $solde = $solde = $solde + $totalpaye;
 				else $solde = $solde + $fac->total_ttc;
 
 				print '<td align="right">&nbsp;</td>';
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index a37fdc15735..ab41c8dbacc 100755
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -98,12 +98,12 @@ class box_members extends ModeleBoxes
 					$memberstatic->lastname=$objp->lastname;
 					$memberstatic->firstname=$objp->firstname;
 
-					if (! empty($objp->fk_soc)) {
-						$memberstatic->socid = $objp->fk_soc;
-						$memberstatic->fetch_thirdparty();
-						$memberstatic->name=$memberstatic->thirdparty->name;
-					} else {
-						$memberstatic->name=$objp->company;
+					if (! empty($objp->fk_soc)) {
+						$memberstatic->socid = $objp->fk_soc;
+						$memberstatic->fetch_thirdparty();
+						$memberstatic->name=$memberstatic->thirdparty->name;
+					} else {
+						$memberstatic->name=$objp->company;
 					}
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 9fead0436b7..e6a38218566 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -38,8 +38,8 @@ class ExtraFields
 	var $attribute_label;
 	// Tableau contenant le nom des champs en clef et la taille de ces champs en value
 	var $attribute_size;
-	// Tableau contenant le statut unique ou non
-	var $attribute_unique;
+	// Tableau contenant le statut unique ou non
+	var $attribute_unique;
 
 	var $error;
 	var $errno;
@@ -311,10 +311,10 @@ class ExtraFields
 			$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			if ($result > 0)
 			{
-				if ($label)
-				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique);
-				}
+				if ($label)
+				{
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique);
+				}
 				if ($result > 0)
 				{
 					$sql='';
@@ -324,7 +324,7 @@ class ExtraFields
 					}
 					else
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update sql='.$sql);
 					$resql=$this->db->query($sql,1,'dml');
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index ac982d1798d..e0dea4a81cd 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -146,28 +146,28 @@ function group_prepare_head($object)
     return $head;
 }
 
-/**
- * Prepare array with list of tabs
- *
+/**
+ * Prepare array with list of tabs
+ *
  * @param   Object	$object		Object related to tabs
- * @param	array	$aEntities	Entities array
- * @return  array				Array of tabs
- */
-function entity_prepare_head($object, $aEntities)
-{
-	global $mc;
-
+ * @param	array	$aEntities	Entities array
+ * @return  array				Array of tabs
+ */
+function entity_prepare_head($object, $aEntities)
+{
+	global $mc;
+
 	$head = array();
 
 	foreach($aEntities as $entity)
 	{
 		$mc->getInfo($entity);
-		$head[$entity][0] = $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;entity='.$entity;
-		$head[$entity][1] = $mc->label;
+		$head[$entity][0] = $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;entity='.$entity;
+		$head[$entity][1] = $mc->label;
 		$head[$entity][2] = $entity;
-	}
-
-	return $head;
+	}
+
+	return $head;
 }
 
 /**
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 36a36a2c8c2..ec2eac15147 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -481,7 +481,7 @@ elseif ($action == 'addline')
 
             $localtax1tx= get_localtax($tvatx, 1, $object->thirdparty);
             $localtax2tx= get_localtax($tvatx, 2, $object->thirdparty);
-            $remise_percent=GETPOST('remise_percent');
+            $remise_percent=GETPOST('remise_percent');
             $type = $product->type;
 
             $result=$object->addline($label, $product->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $_POST['qty'], $idprod, $remise_percent);
@@ -499,7 +499,7 @@ elseif ($action == 'addline')
         $tauxtva = price2num($_POST['tauxtva']);
         $localtax1tx= get_localtax($tauxtva, 1, $object->thirdparty);
         $localtax2tx= get_localtax($tauxtva, 2, $object->thirdparty);
-        $remise_percent=GETPOST('remise_percent');
+        $remise_percent=GETPOST('remise_percent');
         
         if (! $_POST['dp_desc'])
         {
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index c7ecb17f1da..1829ab14e71 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -382,7 +382,7 @@ if($cp_events == 1) {
 }
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?leftmenu=setup" name="event_create">'."\n";
-print '<input type="hidden" name="action" value="create_event" />'."\n";
+print '<input type="hidden" name="action" value="create_event" />'."\n";
 
 print $langs->trans('TitleCreateEventCP');
 
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 9bfaaf8b32f..f528499cae0 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -140,8 +140,8 @@ if ($action == 'create')
 
 if ($action == 'update')
 {
-	$date_debut = dol_mktime(0, 0, 0, $_POST['date_debut_month'], $_POST['date_debut_day'], $_POST['date_debut_year']);
-	$date_fin = dol_mktime(0, 0, 0, $_POST['date_fin_month'], $_POST['date_fin_day'], $_POST['date_fin_year']);
+	$date_debut = dol_mktime(0, 0, 0, $_POST['date_debut_month'], $_POST['date_debut_day'], $_POST['date_debut_year']);
+	$date_fin = dol_mktime(0, 0, 0, $_POST['date_fin_month'], $_POST['date_fin_day'], $_POST['date_fin_year']);
 
     // Si pas le droit de modifier une demande
     if(!$user->rights->holiday->write)
@@ -304,7 +304,7 @@ if ($action == 'confirm_send')
 
             // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
             if($cp->getConfCP('AlertValidatorSolde')) {
-            	$nbopenedday=num_open_day($cp->date_debut,$cp->date_fin,0,1);
+            	$nbopenedday=num_open_day($cp->date_debut,$cp->date_fin,0,1);
                 if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
                 {
                     $message.= "\n";
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index 01d3d7210a7..8ca966b451c 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -294,7 +294,7 @@ if (! empty($holiday->holiday))
 		print '<td style="text-align: center;">'.$infos_CP['date_fin'].'</td>';
 		print '<td>';
 		$nbopenedday=num_open_day($infos_CP['date_debut'],$infos_CP['date_fin'],0,1);
-		print $nbopenedday.' '.$langs->trans('Jours');
+		print $nbopenedday.' '.$langs->trans('Jours');
 		print '<td align="center"><a href="./fiche.php?id='.$infos_CP['rowid'].'">'.$statut.'</a></td>';
 		print '</tr>'."\n";
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index f8156ef04d0..f581375463b 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -122,7 +122,7 @@ if($num == '0') {
 		print '<td>'.$holiday['date_debut'].'</td>';
 		print '<td>'.$holiday['date_fin'].'</td>';
 		print '<td>';
-		$nbopenedday=num_open_day($holiday['date_debut'],$holiday['date_fin'],0,1);
+		$nbopenedday=num_open_day($holiday['date_debut'],$holiday['date_fin'],0,1);
 		print $nbopenedday;
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index f39bb207a8f..e229db46c32 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -269,11 +269,11 @@ if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivat
 // For multicompany transversal mode
 if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
 {
-	$aEntities=array_keys($permsgroupbyentity);
+	$aEntities=array_keys($permsgroupbyentity);
 	sort($aEntities);
-	$entity = (GETPOST('entity', 'int')?GETPOST('entity', 'int'):$aEntities[0]);
+	$entity = (GETPOST('entity', 'int')?GETPOST('entity', 'int'):$aEntities[0]);
 	$head = entity_prepare_head($fuser, $aEntities);
-	$title = $langs->trans("Entities");
+	$title = $langs->trans("Entities");
 	dol_fiche_head($head, $entity, $title, 1, 'multicompany@multicompany');
 }
 
@@ -281,7 +281,7 @@ print "\n";
 print '<table width="100%" class="noborder">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Module").'</td>';
-if ($caneditperms) print '<td>&nbsp</td>';
+if ($caneditperms) print '<td>&nbsp</td>';
 print '<td align="center" width="24">&nbsp;</td>';
 print '<td>'.$langs->trans("Permissions").'</td>';
 print '</tr>'."\n";
@@ -314,29 +314,29 @@ if ($result)
             continue;
         }
 
-        if (isset($obj->module) && ($oldmod <> $obj->module))
-        {
-        	$oldmod = $obj->module;
-        	$var = !$var;
-
-        	// Rupture detectee, on recupere objMod
-        	$objMod=$modules[$obj->module];
-        	$picto=($objMod->picto?$objMod->picto:'generic');
-
-        	if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
-        	{
-        		// On affiche ligne pour modifier droits
+        if (isset($obj->module) && ($oldmod <> $obj->module))
+        {
+        	$oldmod = $obj->module;
+        	$var = !$var;
+
+        	// Rupture detectee, on recupere objMod
+        	$objMod=$modules[$obj->module];
+        	$picto=($objMod->picto?$objMod->picto:'generic');
+
+        	if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
+        	{
+        		// On affiche ligne pour modifier droits
         		print '<tr '. $bc[$var].'>';
-        		print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName();
+        		print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName();
         		print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
-        		print '<td align="center" nowrap="nowrap">';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
-        		print '/';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
-        		print '</td>';
-        		print '<td colspan="2">&nbsp;</td>';
-        		print '</tr>'."\n";
-        	}
+        		print '<td align="center" nowrap="nowrap">';
+        		print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+        		print '/';
+        		print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+        		print '</td>';
+        		print '<td colspan="2">&nbsp;</td>';
+        		print '</tr>'."\n";
+        	}
         }
 
         print '<tr '. $bc[$var].'>';
@@ -344,47 +344,47 @@ if ($result)
         // Picto and label of permission
         print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
 
-        // Permission and tick
-        if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
-        	}
-        	print '<td align="center" nowrap="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-        else if (in_array($obj->id, $permsuser))					// Permission own by user
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-        	}
-        	print '<td align="center" nowrap="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-        else if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center">';
-        		print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
-        		print '</td>';
-        	}
-        	print '<td align="center" nowrap="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-        else
-        {
-        	// Do not own permission
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-        	}
-        	print '<td>&nbsp</td>';
+        // Permission and tick
+        if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
+        {
+        	if ($caneditperms)
+        	{
+        		print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
+        	}
+        	print '<td align="center" nowrap="nowrap">';
+        	print img_picto($langs->trans("Active"),'tick');
+        	print '</td>';
+        }
+        else if (in_array($obj->id, $permsuser))					// Permission own by user
+        {
+        	if ($caneditperms)
+        	{
+        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+        	}
+        	print '<td align="center" nowrap="nowrap">';
+        	print img_picto($langs->trans("Active"),'tick');
+        	print '</td>';
+        }
+        else if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
+        {
+        	if ($caneditperms)
+        	{
+        		print '<td align="center">';
+        		print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
+        		print '</td>';
+        	}
+        	print '<td align="center" nowrap="nowrap">';
+        	print img_picto($langs->trans("Active"),'tick');
+        	print '</td>';
+        }
+        else
+        {
+        	// Do not own permission
+        	if ($caneditperms)
+        	{
+        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+        	}
+        	print '<td>&nbsp</td>';
         }
 
         $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));

From 13cbf154e1f51d455a8a7a4c74b6b7ffc73a8661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 1 Oct 2012 03:09:37 +0200
Subject: [PATCH 5/6] Added missing & improved es_ES translations

---
 htdocs/langs/es_ES/companies.lang | 1 +
 htdocs/langs/es_ES/install.lang   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index a8562f8885e..90f1529acd7 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -79,6 +79,7 @@ Poste=Puesto
 DefaultLang=Idioma por defecto
 VATIsUsed=Sujeto a IVA
 VATIsNotUsed=No sujeto a IVA
+CopyAddressFromSoc=Copiar dirección de la empresa
 ##### Local Taxes #####=
 LocalTax1IsUsedES=Sujeto a RE
 LocalTax1IsNotUsedES=No sujeto a RE
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 3a3870daf2b..700fdf4d022 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -15,8 +15,8 @@ PHPSupportPOSTGETOk=Este PHP soporta bien las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que este PHP no soporte las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> del php.ini.
 PHPSupportGD=Este PHP soporta las funciones gráficas GD.
 PHPSupportUTF8=Este PHP soporta las funciones UTFB.
-PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>.  Esto debería ser suficiente.
-PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a al menos <b>%s</b> octetos.
+PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
+PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
 Recheck=Haga click aquí para realizar un test más exhaustivo
 ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta funcionalidad es necesaria para hacer funcionar a Dolibarr. Compruebe su configuración de PHP.
 ErrorPHPDoesNotSupportGD=Este PHP no soporta las funciones gráficas GD. Ningún gráfico estará disponible.

From a4b0f7e521ba870a971cb58928803ac437b5db3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 1 Oct 2012 04:17:17 +0200
Subject: [PATCH 6/6] Fixed es_ES typo

---
 htdocs/langs/es_ES/admin.lang    | 2 +-
 htdocs/langs/es_ES/cashdesk.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 58005491211..3a4ea364a22 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1256,7 +1256,7 @@ MantisTestKo1=La conexión al servidor '%s' es correcta pero la base de datos' %
 MantisTestKo2=La conexión al servidor '%s' por el usuario '%s' a fallado.
 MantisErrorConnectOkButWrongDatabase=La conexión es correcta pero la base de datos no parece ser una base de datos Mantis.
 ##### Stock #####
-StockSetup=configuración del módulo Stock
+StockSetup=Configuración del módulo Stocks
 UserWarehouse=Utilizar los stocks personales de usuarios
 ##### Menu #####
 MenuDeleted=Menú eliminado
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 0a24dd1290b..2520879a012 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -32,7 +32,7 @@ TotalTicket=Total ticket
 NoVAT=Sin IVA en esta venta
 Change=Cambio
 CalTip=Haga clic para ver el calendario
-CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
+CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stocks, o escoja un almacén
 BankToPay=Cuenta de cobro
 ShowCompany=Ver empresa
 ShowStock=Ver almacén